Skip to content

K
k3s
Unverified Commit 1669277b authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub
Browse files
Options

Merge pull request #68350 from wgliang/fixbug/recursive-call-cloudprovider

fix bug, infinite recursive call of GetLoadBalancerName()
parents e85cb406 31c7eac2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
pkg/cloudprovider/providers/cloudstack/cloudstack_loadbalancer.go
View file @ 1669277b
...@@ -23,7 +23,9 @@ import ( ...@@ -23,7 +23,9 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/xanzy/go-cloudstack/cloudstack" "github.com/xanzy/go-cloudstack/cloudstack"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
cloudprovider "k8s.io/cloud-provider"
) )
type loadBalancer struct { type loadBalancer struct {
...@@ -239,7 +241,7 @@ func (cs *CSCloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName st ...@@ -239,7 +241,7 @@ func (cs *CSCloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName st
// GetLoadBalancerName retrieves the name of the LoadBalancer. // GetLoadBalancerName retrieves the name of the LoadBalancer.
func (cs *CSCloud) GetLoadBalancerName(ctx context.Context, clusterName string, service *v1.Service) string { func (cs *CSCloud) GetLoadBalancerName(ctx context.Context, clusterName string, service *v1.Service) string {
return cs.GetLoadBalancerName(ctx, clusterName, service) return cloudprovider.DefaultLoadBalancerName(service)
} }
// getLoadBalancer retrieves the IP address and ID and all the existing rules it can find. // getLoadBalancer retrieves the IP address and ID and all the existing rules it can find.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment