diff --git a/go.mod b/go.mod index 8dd77cb179..b4dbc545f6 100644 --- a/go.mod +++ b/go.mod @@ -88,12 +88,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.20240402114036-d4f834cee170 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240407070825-d0e1ae4a72a9 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 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.1-0.20240324150220-11d9be90fa6c + yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e yunion.io/x/sqlchemy v1.1.3-0.20240326090913-96da8bf92408 yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c diff --git a/go.sum b/go.sum index c28f7f0aeb..3a308972c3 100644 --- a/go.sum +++ b/go.sum @@ -1204,8 +1204,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.20240402114036-d4f834cee170 h1:h15cMMot4/FFnD+pVq/1/OvQsBE6Tz6nWX/RT110Kxo= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240402114036-d4f834cee170/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240407070825-d0e1ae4a72a9 h1:yVMdm5deEjCmg2oNc6GrfBKTZhsk6+MXXC+US0oK4hw= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240407070825-d0e1ae4a72a9/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= @@ -1219,8 +1219,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.1-0.20240324150220-11d9be90fa6c h1:c71AlEenWHcA6xJQN8dbtwXxIQA5Uts+wnv87OH7Eas= -yunion.io/x/pkg v1.10.1-0.20240324150220-11d9be90fa6c/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= +yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f h1:5ER9TICQiiLA0klflIRkEuhTUpGaEKaSDKur8BJ96Vg= +yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo= yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo= yunion.io/x/sqlchemy v1.1.3-0.20240326090913-96da8bf92408 h1:TmkgsnVG/KsUfxaFxaYEhQs0o4nXc9fFFlqZv6mwZ/E= diff --git a/vendor/modules.txt b/vendor/modules.txt index 46884998bd..ecf0703996 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1472,7 +1472,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.20240402114036-d4f834cee170 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240407070825-d0e1ae4a72a9 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing @@ -1567,7 +1567,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.1-0.20240324150220-11d9be90fa6c +# yunion.io/x/pkg v1.10.1-0.20240407074633-3b5e6127232f ## explicit; go 1.18 yunion.io/x/pkg/appctx yunion.io/x/pkg/errors diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go index 1c84f6241e..3075a2de99 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go @@ -247,7 +247,7 @@ func (self *SImage) GetSizeByte() int64 { func (self *SImage) getNormalizedImageInfo() *imagetools.ImageInfo { if self.imgInfo == nil { - imgInfo := imagetools.NormalizeImageInfo("", self.Architecture, getImageOSType(*self), getImageOSDist(*self), getImageOSVersion(*self)) + imgInfo := imagetools.NormalizeImageInfo(self.ImageName, self.Architecture, getImageOSType(*self), getImageOSDist(*self), getImageOSVersion(*self)) self.imgInfo = &imgInfo } return self.imgInfo diff --git a/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go b/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go index 8d88786b03..b7f38e0b29 100644 --- a/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go +++ b/vendor/yunion.io/x/pkg/util/imagetools/imagetools.go @@ -141,7 +141,7 @@ var imageVersions = map[string][]string{ "Alibaba Cloud Linux": {"2.1903", "3.2104"}, "Anolis OS": {"7.9", "8.2", "8.4"}, - "Rocky Linux": {"8.5"}, + "Rocky Linux": {"8.5", "8.6", "8.7", "8.8", "8.9", "9.0", "9.1", "9.2"}, "Fedora": {"33", "34", "35"}, "AlmaLinux": {"8.5"},