fanhuadesenlinnn/cloudpods
1
0
Fork 0
mirror of https://hubproxy.babadafafafafa.cn/https://github.com/yunionio/cloudpods.git synced 2026-09-21 00:24:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): cloudpods uefi and generate name

Browse Source
This commit is contained in:
ioito
2023-12-07 16:13:14 +08:00
parent 5ae6751ad3
commit 7cadeea34f
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -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.20231204130451-7318d647578b
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080936-b8afa7e45b2e
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

4
go.sum
View File

@@ -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.20231204130451-7318d647578b h1:0UIzuShgK96utj+/rg4EiECT6glNCXOZQAdhMYSoujM=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231204130451-7318d647578b/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080936-b8afa7e45b2e h1:bhjZGbs9E3cQCgyllO0lGhJl/EmppnxU525Xr0eh70U=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080936-b8afa7e45b2e/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=

2
pkg/mcclient/cloudpods/image.go
View File

@@ -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,

2
vendor/modules.txt vendored
View File

@@ -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.20231204130451-7318d647578b
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231207080936-b8afa7e45b2e
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing

2
vendor/yunion.io/x/cloudmux/pkg/cloudprovider/images.go generated vendored
View File

@@ -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{