opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): vendor update (#22499)

Browse Source
This commit is contained in:
屈轩
2025-05-09 14:56:13 +08:00
committed by GitHub
parent ae7d4f7d22
commit 4930e191dc
5 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -87,7 +87,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.20250508100452-51742e9c8266
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57
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
go.sum
+2 -2
View File
@@ -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.20250508100452-51742e9c8266 h1:ci2s8wllLSZR4Zdh5FpcOfVpyBydOqEi/X8X1ePgmuw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508100452-51742e9c8266/go.mod h1:FXxAEbdNfWXX9gjME3K2nJhkydHY5EKEUZb+RLEzVwQ=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57 h1:pTIqSYPPDuWsgYJ6zl9kjNNYyvrfDfySRp+2kmlcF/k=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57/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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -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.20250508100452-51742e9c8266
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20250508131448-6abefa38df57
## explicit; go 1.21
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/image.go
Generated Vendored
+4
View File
@@ -24,6 +24,7 @@ import (
"yunion.io/x/log"
"yunion.io/x/pkg/errors"
"yunion.io/x/pkg/util/imagetools"
"yunion.io/x/pkg/utils"
api "yunion.io/x/cloudmux/pkg/apis/compute"
"yunion.io/x/cloudmux/pkg/cloudprovider"
@@ -237,6 +238,9 @@ func (self *SImage) GetBlockDeviceNames() []string {
ret := []string{}
for _, dev := range self.BlockDeviceMapping {
ret = append(ret, dev.DeviceName)
if strings.HasPrefix(dev.DeviceName, "/dev/xvd") && !utils.IsInStringArray("/dev/sda", ret) { // 系统盘是/dev/xvda, 则不能指定devName 为 /dev/sda
ret = append(ret, "/dev/sda")
}
}
return ret
}
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/instance.go
Generated Vendored
+1 -7
View File
@@ -654,13 +654,7 @@ func (self *SInstance) AttachDisk(ctx context.Context, diskId string) error {
return errors.Wrap(err, "GetImage")
}
deviceNames := []string{}
// mix in image block device names
for i := range img.BlockDeviceMapping {
if !utils.IsInStringArray(img.BlockDeviceMapping[i].DeviceName, deviceNames) {
deviceNames = append(deviceNames, img.BlockDeviceMapping[i].DeviceName)
}
}
deviceNames := img.GetBlockDeviceNames()
name, err := NextDeviceName(deviceNames)
if err != nil {