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

Merge pull request #18361 from ioito/automated-cherry-pick-of-#18360-upstream-release-3.11

Browse Source 
Automated cherry pick of #18360: fix(region): aws lb sync panic
This commit is contained in:
Zexi Li
2023-10-19 20:34:13 +08:00
committed by GitHub
parent b6e1e9d226 b7ec468b03
commit 7e7b6512f4
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
View File
@@ -83,7 +83,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.20231018084051-f3c745277c53
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231019121227-eb3c4e767590
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
go.sum
+2 -2
View File
@@ -1179,8 +1179,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.20231018084051-f3c745277c53 h1:2solB1Xshx4Y/cZ12YLQTrDcvPvspy/9t+BW+K0bWWU=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231018084051-f3c745277c53/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231019121227-eb3c4e767590 h1:onLmbrpw3VsUlcXJiI+k+ax7k9PgXLfr/Gb+T19PDtc=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231019121227-eb3c4e767590/go.mod h1:McRjoG2gaOUisB+Qa41kLCNZhr0lsCu4apEjTiphXVY=
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=
vendor/modules.txt
Vendored
+1 -1
View File
@@ -1438,7 +1438,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.20231018084051-f3c745277c53
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231019121227-eb3c4e767590
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/loadbalancer.go
Generated Vendored
+1 -1
View File
@@ -303,7 +303,7 @@ func (self *SRegion) GetElbBackendgroups(elbId, id string) ([]SElbBackendGroup,
NextMarker string `xml:"NextMarker"`
TargetGroups []SElbBackendGroup `xml:"TargetGroups>member"`
}{}
err := self.elbRequest("DescribeTargetGroups", params, part)
err := self.elbRequest("DescribeTargetGroups", params, &part)
if err != nil {
return nil, errors.Wrapf(err, "DescribeTargetGroups")
}