diff --git a/go.mod b/go.mod index 1a9264c2ae..9a0b43bdc6 100644 --- a/go.mod +++ b/go.mod @@ -87,12 +87,12 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250113015525-b483c92621d7 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250212024113-8e46641f76b2 yunion.io/x/executor v0.0.0-20241205080005-48f5b1212256 yunion.io/x/jsonutils v1.0.1-0.20240930100528-1671a2d0d22f yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 - yunion.io/x/pkg v1.10.4-0.20250123070256-9247ce856f07 + yunion.io/x/pkg v1.10.4-0.20250128110515-2cde6f625882 yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 yunion.io/x/sqlchemy v1.1.3-0.20240926163039-d41512b264e1 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c diff --git a/go.sum b/go.sum index ebb6f5dd79..b0fa93e7ba 100644 --- a/go.sum +++ b/go.sum @@ -1274,8 +1274,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.20250113015525-b483c92621d7 h1:f3j4AHOANU1rDyHmXpPdmVklpL1NFODhcYXDXtt5gOE= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250113015525-b483c92621d7/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250212024113-8e46641f76b2 h1:v6icJ6xiuEWUjTLECzUtwB/Yc9EjrvaQuB+oHNyRD2I= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250212024113-8e46641f76b2/go.mod h1:KQ/jWx7bZlmjCE711KEWuvHW/dzpdr/UTlBjjutkj0Y= 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= @@ -1289,8 +1289,8 @@ yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900 h1:Hu/4ERvoWaN6aiFs4h4/yvVB yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900/go.mod h1:0vLkNEhlmA64HViPBAnSTUMrx5QP1CLsxXmxDKQ80tc= yunion.io/x/pkg v0.0.0-20190620104149-945c25821dbf/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= yunion.io/x/pkg v0.0.0-20190628082551-f4033ba2ea30/go.mod h1:t6rEGG2sQ4J7DhFxSZVOTjNd0YO/KlfWQyK1W4tog+E= -yunion.io/x/pkg v1.10.4-0.20250123070256-9247ce856f07 h1:XZsL8+YpgVBHMcRwdpZ4cOfSZCc+KsgUCTdV3KeK8FI= -yunion.io/x/pkg v1.10.4-0.20250123070256-9247ce856f07/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM= +yunion.io/x/pkg v1.10.4-0.20250128110515-2cde6f625882 h1:Nl4qngZ4mrVe2xsMVrCHLe9t+nY/KpaBXO9a0sTbg4M= +yunion.io/x/pkg v1.10.4-0.20250128110515-2cde6f625882/go.mod h1:0Bwxqd9MA3ACi119/l02FprY/o9gHahmYC2bsSbnVpM= yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1 h1:1KJ3YYinydPHpDEQRXdr/T8SYcKZ5Er+m489H+PnaQ4= yunion.io/x/s3cli v0.0.0-20241221171442-1c11599d28e1/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= yunion.io/x/sqlchemy v1.1.3-0.20240926163039-d41512b264e1 h1:HWPqY1I5JSmM6Sks6FyK9hnq/MjL7FDghM6M8DXHob0= diff --git a/vendor/modules.txt b/vendor/modules.txt index c184ce4d2d..0737c50eeb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1576,7 +1576,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.20250113015525-b483c92621d7 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250212024113-8e46641f76b2 ## explicit; go 1.21 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1671,7 +1671,7 @@ yunion.io/x/log/hooks yunion.io/x/ovsdb/cli_util yunion.io/x/ovsdb/schema/ovn_nb yunion.io/x/ovsdb/types -# yunion.io/x/pkg v1.10.4-0.20250123070256-9247ce856f07 +# yunion.io/x/pkg v1.10.4-0.20250128110515-2cde6f625882 ## explicit; go 1.18 yunion.io/x/pkg/appctx yunion.io/x/pkg/errors diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/storage.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/storage.go index 42b7ad3f4b..4254f727ab 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/storage.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/storage.go @@ -29,7 +29,6 @@ package aliyun import ( "fmt" - "strings" "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" @@ -103,16 +102,11 @@ func (self *SStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) { } func (self *SStorage) GetStorageType() string { - //return models.STORAGE_PUBLIC_CLOUD return self.storageType } func (self *SStorage) GetMediumType() string { - if strings.Contains(self.storageType, "_ssd") { - return api.DISK_TYPE_SSD - } else { - return api.DISK_TYPE_ROTATE - } + return api.DISK_TYPE_SSD } func (self *SStorage) GetCapacityMB() int64 { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/tag_base.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/tag_base.go index 115422ea3b..c265a476c2 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/tag_base.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/tag_base.go @@ -35,7 +35,7 @@ var sysTags = []string{ "acs:", "serverless/", "alloc_id", "virtual-kubelet", "diskId", "diskNum", "serverId", "restoreId", "cnfs-id", "from", "shadowId", "ack.aliyun.com", "cluster-id.ack.aliyun.com", "ack.alibabacloud.com", - "k8s.io", "kubernetes.do.not.delete", "kubernetes.reused.by.user", + "k8s.io", "k8s.aliyun.com", "kubernetes.do.not.delete", "kubernetes.reused.by.user", "HBR InstanceId", "HBR Retention Days", "HBR Retention Type", "HBR JobId", "createdBy", "recoveryPointTime", "recoveryPointId", "eas_resource_group_name", "eas_tenant_name", "managedby", diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storage.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storage.go index a29c08acfd..2c6b722af1 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storage.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/storage.go @@ -189,6 +189,9 @@ func (self *SDatastore) getAttachedHosts() ([]cloudprovider.ICloudHost, error) { idstr := moRefId(moStore.Host[i].Key) host, err := self.datacenter.GetIHostByMoId(idstr) if err != nil { + if errors.Cause(err) == cloudprovider.ErrNotFound { + continue + } return nil, err } ihosts = append(ihosts, host) diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go index 1c5ab92f5b..a250016a15 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go @@ -75,6 +75,7 @@ func (t *SVMTemplate) GetGlobalId() string { func (t *SVMTemplate) GetStatus() string { ihosts, err := t.cache.datastore.GetAttachedHosts() if err != nil { + log.Errorf("GetAttachedHosts for image %s error: %v", t.GetName(), err) return api.CACHED_IMAGE_STATUS_CACHE_FAILED } for _, ihost := range ihosts { @@ -88,6 +89,7 @@ func (t *SVMTemplate) GetStatus() string { return api.CACHED_IMAGE_STATUS_CACHE_FAILED } } + log.Errorf("empty host attached for image %s", t.GetName()) return api.CACHED_IMAGE_STATUS_CACHE_FAILED } diff --git a/vendor/yunion.io/x/pkg/util/qemuimgfmt/fmt.go b/vendor/yunion.io/x/pkg/util/qemuimgfmt/fmt.go index 6425ffbb19..afadd186f7 100644 --- a/vendor/yunion.io/x/pkg/util/qemuimgfmt/fmt.go +++ b/vendor/yunion.io/x/pkg/util/qemuimgfmt/fmt.go @@ -26,10 +26,11 @@ const ( VHD = TImageFormat("vhd") ISO = TImageFormat("iso") RAW = TImageFormat("raw") + TGZ = TImageFormat("tgz") ) var supportedImageFormats = []TImageFormat{ - QCOW2, VMDK, VHD, ISO, RAW, + QCOW2, VMDK, VHD, ISO, RAW, TGZ, } func IsSupportedImageFormat(fmtStr string) bool { @@ -62,6 +63,8 @@ func String2ImageFormat(fmt string) TImageFormat { return ISO case "raw": return RAW + case "tgz", "tar": + return TGZ } // log.Fatalf("unknown image format!!! %s", fmt) return TImageFormat(fmt)