diff --git a/go.mod b/go.mod index 1329ff189d..daaf38ed5d 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/cluster-bootstrap v0.19.3 k8s.io/cri-api v0.22.17 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240711090534-be51f2898af9 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080010-b184d0ecc090 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 diff --git a/go.sum b/go.sum index 4232f25468..24adb0d9cf 100644 --- a/go.sum +++ b/go.sum @@ -1215,8 +1215,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.20240711090534-be51f2898af9 h1:K3W8t7OBAafonSuHQ8in+yiyhlNM1dTI5MBV7QTbmQs= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240711090534-be51f2898af9/go.mod h1:iLoBHVR2Eur/1WJSGcbZaEwpzh/iqXvbFCsX9/xt8CI= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080010-b184d0ecc090 h1:/07EdD/RSJNFMJb/kDQCms5D5MZ8x2xH2P2eMKYUC/Y= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080010-b184d0ecc090/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= diff --git a/vendor/modules.txt b/vendor/modules.txt index e31e503540..5193c75cd9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1489,7 +1489,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.20240711090534-be51f2898af9 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240712080010-b184d0ecc090 ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backend.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backend.go index 7a06b1d49f..102f20b773 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backend.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backend.go @@ -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 diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backendgroup.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backendgroup.go index 6d861e4572..596d11b304 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backendgroup.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/loadbalancer_backendgroup.go @@ -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