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 for qcloud lb backend sync (#20824)

Browse Source
This commit is contained in:
屈轩
2024-07-17 14:17:28 +08:00
committed by GitHub
parent ff88eb87ca
commit eb72ec047d
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+1 -1
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.20240711090536-14494cdd1d8b
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080025-b1e03e3d278a
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
go.sum
+2 -2
View File
@@ -1210,8 +1210,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.20240711090536-14494cdd1d8b h1:HZkOIPA5jXMhbqp9ZT+aDk8/jqnSyG/b6+Iim75WCAU=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240711090536-14494cdd1d8b/go.mod h1:iLoBHVR2Eur/1WJSGcbZaEwpzh/iqXvbFCsX9/xt8CI=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080025-b1e03e3d278a h1:UHTXQHmTD+/2du7RRHK74NFknMRldyTa1d+DKiQAQfs=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080025-b1e03e3d278a/go.mod h1:iLoBHVR2Eur/1WJSGcbZaEwpzh/iqXvbFCsX9/xt8CI=
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
@@ -1485,7 +1485,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.20240711090536-14494cdd1d8b
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080025-b1e03e3d278a
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backend.go
Generated Vendored
+2 -6
View File
@@ -134,13 +134,9 @@ func (self *SRegion) GetBackends(lbId, listenerId string) ([]SLBBackend, error)
}
backends := []SLBBackend{}
for _, entry := range lbackends {
if len(entry.Targets) > 0 {
backends = append(backends, entry.Targets...)
}
backends = append(backends, entry.Targets...)
for _, r := range entry.Rules {
if len(r.Targets) > 0 {
backends = append(backends, r.Targets...)
}
backends = append(backends, r.Targets...)
}
}
return backends, nil
vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backendgroup.go
Generated Vendored
+5 -1
View File
@@ -180,9 +180,13 @@ func (self *SLBBackendGroup) GetILoadbalancerBackends() ([]cloudprovider.ICloudL
}
ret := []cloudprovider.ICloudLoadbalancerBackend{}
globalIds := map[string]bool{}
for i := range backends {
backends[i].group = self
ret = append(ret, &backends[i])
if _, ok := globalIds[backends[i].GetGlobalId()]; !ok {
globalIds[backends[i].GetGlobalId()] = true
ret = append(ret, &backends[i])
}
}
return ret, nil