diff --git a/go.mod b/go.mod index 2efd5906e4..3db78faaa7 100644 --- a/go.mod +++ b/go.mod @@ -93,7 +93,7 @@ require ( k8s.io/cri-api v0.22.17 k8s.io/klog/v2 v2.20.0 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131436-d71dd107cfd3 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250512041816-e0d1de4ee3ad yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 yunion.io/x/jsonutils v1.0.1-0.20250507052344-1abcf4f443b1 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index f13f6e0dbd..dc73a7ca35 100644 --- a/go.sum +++ b/go.sum @@ -1376,8 +1376,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131436-d71dd107cfd3 h1:igwEax8x7LEZaEc+o81Mig2UfUp7jI1N5Ga2rwN5UL8= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131436-d71dd107cfd3/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250512041816-e0d1de4ee3ad h1:6l2kdc3Hht3Bh81TNR17MPVAx81QKLpDBpN3+1WxONc= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250512041816-e0d1de4ee3ad/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 h1:kLKQ6zbgPDQflRwoHFAjxNChcbhXIFgsUVLkJwiXu/8= yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/apis/compute/cloudaccount_const.go b/pkg/apis/compute/cloudaccount_const.go index aafe1cd1cb..8dcbfb6859 100644 --- a/pkg/apis/compute/cloudaccount_const.go +++ b/pkg/apis/compute/cloudaccount_const.go @@ -75,6 +75,7 @@ const ( CLOUD_PROVIDER_ZETTAKIT = compute.CLOUD_PROVIDER_ZETTAKIT CLOUD_PROVIDER_UIS = compute.CLOUD_PROVIDER_UIS CLOUD_PROVIDER_CAS = compute.CLOUD_PROVIDER_CAS + CLOUD_PROVIDER_CLOUDFLARE = compute.CLOUD_PROVIDER_CLOUDFLARE CLOUD_PROVIDER_GENERICS3 = compute.CLOUD_PROVIDER_GENERICS3 CLOUD_PROVIDER_CEPH = compute.CLOUD_PROVIDER_CEPH @@ -143,6 +144,7 @@ var ( CLOUD_PROVIDER_JDCLOUD, CLOUD_PROVIDER_VOLCENGINE, CLOUD_PROVIDER_ORACLE, + CLOUD_PROVIDER_CLOUDFLARE, } CLOUD_PROVIDERS = []string{ @@ -181,6 +183,7 @@ var ( CLOUD_PROVIDER_ZETTAKIT, CLOUD_PROVIDER_UIS, CLOUD_PROVIDER_CAS, + CLOUD_PROVIDER_CLOUDFLARE, } CLOUD_PROVIDER_HOST_TYPE_MAP = map[string][]string{ diff --git a/vendor/modules.txt b/vendor/modules.txt index ce836826a5..ff8a3e2a63 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1785,7 +1785,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131436-d71dd107cfd3 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250512041816-e0d1de4ee3ad ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go index 0c9f15f0ec..86b8cc142b 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go +++ b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go @@ -56,6 +56,8 @@ const ( CLOUD_PROVIDER_CEPHFS = "CephFS" CLOUD_PROVIDER_XSKY = "Xsky" + CLOUD_PROVIDER_CLOUDFLARE = "Cloudflare" + CLOUD_PROVIDER_HEALTH_NORMAL = "normal" // 远端处于健康状态 CLOUD_PROVIDER_HEALTH_INSUFFICIENT = "insufficient" // 不足按需资源余额 CLOUD_PROVIDER_HEALTH_SUSPENDED = "suspended" // 远端处于冻结状态