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

fix(region): vendor update (#25457)

Browse Source
This commit is contained in:
屈轩
2026-09-01 13:41:26 +08:00
committed by GitHub
parent 3082bb6b83
commit 9f2b500694
7 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@@ -112,7 +112,7 @@ require (
k8s.io/cri-api v0.28.15
k8s.io/klog/v2 v2.90.1
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260819093747-311f52c4fa1a
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260831080818-2179b7a0181c
yunion.io/x/executor v0.0.0-20260312022053-f538abd2b005
yunion.io/x/jsonutils v1.0.1-0.20260715075349-615cfb44ff7c
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91

4
go.sum
View File

@@ -1754,8 +1754,8 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260819093747-311f52c4fa1a h1:o3WfnRmKxVrI8KN9t0Pnlswds2qFRMKyslk6bM3jNoA=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260819093747-311f52c4fa1a/go.mod h1:IwmeqVkld+4XylS80cyVBXyN8fJ5ynAspd/6tcvqJuc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260831080818-2179b7a0181c h1:/SYJVNyrocWhzaQ+WQiGRS/o/RdOb93+ZhIk4T2FsUU=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260831080818-2179b7a0181c/go.mod h1:IwmeqVkld+4XylS80cyVBXyN8fJ5ynAspd/6tcvqJuc=
yunion.io/x/executor v0.0.0-20260312022053-f538abd2b005 h1:3sWwcjGXGjG9mLBWa7AyLq+QSi0udTAx21pfVQRFMBE=
yunion.io/x/executor v0.0.0-20260312022053-f538abd2b005/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

2
vendor/modules.txt vendored
View File

@@ -2545,7 +2545,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.3.0
## explicit; go 1.12
sigs.k8s.io/yaml
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260819093747-311f52c4fa1a
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20260831080818-2179b7a0181c
## explicit; go 1.24
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing

1
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/latitud_and_longitude.go generated vendored
View File

@@ -62,4 +62,5 @@ var LatitudeAndLongitude = map[string]cloudprovider.SGeographicInfo{
"eu-central-1": api.RegionFrankfurt,
"me-east-1": api.RegionDubai,
"me-central-1": api.RegionDubai,
"sa-east-1": api.RegionSaoPaulo,
}

2
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/latitude_and_longitude.go generated vendored
View File

@@ -53,7 +53,7 @@ var LatitudeAndLongitude = map[string]cloudprovider.SGeographicInfo{
"ap-southeast-4": api.RegionMelbourne,
"ap-south-2": api.RegionHyderabad,
"eu-south-2": api.RegionMadrid,
"eu-central-2": api.RegionAbuDhabi,
"eu-central-2": api.RegionZurich,
"ap-southeast-3": api.RegionJakarta,
"me-central-1": api.RegionDubai,
"il-central-1": api.RegionTelAviv,

5
vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/tags.go generated vendored
View File

@@ -61,7 +61,10 @@ func (svm *SVirtualMachine) GetSysTags() map[string]string {
for i := 3; i < len(paths); i++ {
meta[fmt.Sprintf("folder_%d", i-3)] = paths[i]
}
meta["networks"] = svm.getNetTags()
networks := svm.getNetTags()
if len(networks) > 0 {
meta["networks"] = networks
}
// meta["datacenter"] = svm.GetDatacenterPathString()
rp, _ := svm.getResourcePool()
if rp != nil {

20
vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/instance.go generated vendored
View File

@@ -370,6 +370,26 @@ func (self *SInstance) GetINics() ([]cloudprovider.ICloudNic, error) {
return ret, nil
}
func (self *SInstance) getNetTags() string {
info := make([]string, 0)
for _, nicConf := range self.QemuNetworks {
info = append(info, nicConf.MacAddr, nicConf.NicId)
if len(nicConf.IpAddr) > 0 {
info = append(info, nicConf.IpAddr)
}
}
return strings.Join(info, "/")
}
func (self *SInstance) GetSysTags() map[string]string {
meta := map[string]string{}
networks := self.getNetTags()
if len(networks) > 0 {
meta["networks"] = networks
}
return meta
}
func (self *SInstance) GetInstanceType() string {
return fmt.Sprintf("ecs.g1.c%dm%d", self.GetVcpuCount(), self.GetVmemSizeMB()/1024)
}