opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-28 19:45:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16025 from ioito/hotfix/qx-aliyun-lb-tags

Browse Source 
fix(region): aliyun lb tag sync
This commit is contained in:
Zexi Li
2023-02-23 00:37:11 +08:00
committed by GitHub
parent 394e6387e9 c05b2e4b0d
commit 767882b264
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -81,7 +81,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.20230220095739-1ab9c31dce86
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230222084258-da453fa38129
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
yunion.io/x/log v1.0.0
go.sum
+2 -2
View File
@@ -1158,8 +1158,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.20230220095739-1ab9c31dce86 h1:9h/MiURFtKSbaTPQRdbG+j9L6CzkMc3gGqNBSz/Gxk8=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230220095739-1ab9c31dce86/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230222084258-da453fa38129 h1:JF2IOoPDeOg5oGcM7px3IVp06YVtGJfN7BnLLGFmfMs=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230222084258-da453fa38129/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/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
@@ -1439,7 +1439,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.20230220095739-1ab9c31dce86
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230222084258-da453fa38129
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/loadbalancer.go
Generated Vendored
+5
View File
@@ -415,6 +415,11 @@ func (lb *SLoadbalancer) SetTags(tags map[string]string, replace bool) error {
return lb.region.SetResourceTags(ALIYUN_SERVICE_SLB, "instance", lb.LoadBalancerId, tags, replace)
}
func (lb *SLoadbalancer) GetTags() (map[string]string, error) {
_, tags, err := lb.region.ListSysAndUserTags("slb", "instance", lb.LoadBalancerId)
return tags, err
}
// mapping aliyun finance zoneId to aliyun finance ecs zoneId
func transZoneIdToEcsZoneId(region *SRegion, service, zoneId string) string {
if region.GetCloudEnv() == ALIYUN_FINANCE_CLOUDENV {