From 170b2abe5dac390196f99e5d9beec2ea8078876c Mon Sep 17 00:00:00 2001 From: ioito Date: Thu, 7 Dec 2023 16:13:14 +0800 Subject: [PATCH] fix(region): cloudpods uefi and generate name --- go.mod | 2 +- go.sum | 4 ++-- pkg/mcclient/cloudpods/image.go | 2 +- vendor/modules.txt | 2 +- vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 4111cdf7ba..fde1bbe468 100644 --- a/go.mod +++ b/go.mod @@ -88,7 +88,7 @@ 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.20231204130443-d54a8b16c7b7 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080924-27d6d043d718 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19 yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361 diff --git a/go.sum b/go.sum index 5705a3f0a5..a5945e5162 100644 --- a/go.sum +++ b/go.sum @@ -1201,8 +1201,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.20231204130443-d54a8b16c7b7 h1:fZ3sE1acOojrgXGtqLxXcfFhg4bT3shKx2o73J+Yat8= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231204130443-d54a8b16c7b7/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080924-27d6d043d718 h1:eTDw4t3L27J98ID7nSqd7yBK8GFtxnzkoHo+7INJSdE= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080924-27d6d043d718/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0= 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= diff --git a/pkg/mcclient/cloudpods/image.go b/pkg/mcclient/cloudpods/image.go index 39407d8e74..bae2c7fbdf 100644 --- a/pkg/mcclient/cloudpods/image.go +++ b/pkg/mcclient/cloudpods/image.go @@ -194,7 +194,7 @@ func (self *SRegion) UploadImage(ctx context.Context, opts *cloudprovider.SImage } params := map[string]interface{}{ - "name": opts.ImageName, + "generate_name": opts.ImageName, "properties": map[string]string{ "os_type": opts.OsType, "os_distribution": opts.OsDistribution, diff --git a/vendor/modules.txt b/vendor/modules.txt index 33731338c7..1506e46b17 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1465,7 +1465,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.20231204130443-d54a8b16c7b7 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080924-27d6d043d718 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go index cebd2cc849..bfe63fb3ab 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go @@ -77,7 +77,7 @@ type SaveImageOptions struct { func CloudImage2Image(image ICloudImage) SImage { uefiSupport := false - if image.GetBios() == BIOS { + if image.GetBios() == UEFI { uefiSupport = true } return SImage{