github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-03 15:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Revert #7145 now that #7609 is in, and fix the tests that were relying on it"

Browse Source
This commit is contained in:
Quinton Hoole
2015-05-02 23:32:21 -07:00
parent b447dc0c54
commit 83b70c4411
3 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/servicecontroller/servicecontroller.go
View File

@@ -438,7 +438,7 @@ func needsUpdate(oldService *api.Service, newService *api.Service) bool {
}
func (s *ServiceController) loadBalancerName(service *api.Service) string {
return cloudprovider.GetLoadBalancerName(s.clusterName, service.Namespace, service.Name)
return cloudprovider.GetLoadBalancerName(service)
}
func getTCPPorts(service *api.Service) ([]int, error) {
@@ -571,7 +571,7 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *api.Service,
return nil
}
name := s.loadBalancerName(service)
name := cloudprovider.GetLoadBalancerName(service)
err := s.balancer.UpdateTCPLoadBalancer(name, s.zone.Region, hosts)
if err == nil {
return nil