github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
fix bug, infinite recursive call of GetLoadBalancerName()
This commit is contained in:
k8s-ci-robot 2018-10-17 11:56:51 -07:00 committed by GitHub
commit 1669277bb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/providers/cloudstack/cloudstack_loadbalancer.go
View File

@ -23,7 +23,9 @@ import (
"github.com/golang/glog"
"github.com/xanzy/go-cloudstack/cloudstack"
"k8s.io/api/core/v1"
cloudprovider "k8s.io/cloud-provider"
)
type loadBalancer struct {
@ -239,7 +241,7 @@ func (cs *CSCloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName st
// GetLoadBalancerName retrieves the name of the LoadBalancer.
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.