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

Merge pull request #7635 from a-robinson/length

Browse Source 
Revert #7145 now that #7609 is in, and fix the tests that were relying on it
This commit is contained in:
Jeff Lowdermilk
2015-05-01 17:48:41 -07:00
parent 5350d5e8d3 890ff7b4aa
commit b447dc0c54
3 changed files with 18 additions and 23 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(service)
return cloudprovider.GetLoadBalancerName(s.clusterName, service.Namespace, service.Name)
}
func getTCPPorts(service *api.Service) ([]int, error) {
@@ -571,7 +571,7 @@ func (s *ServiceController) lockedUpdateLoadBalancerHosts(service *api.Service,
return nil
}
name := cloudprovider.GetLoadBalancerName(service)
name := s.loadBalancerName(service)
err := s.balancer.UpdateTCPLoadBalancer(name, s.zone.Region, hosts)
if err == nil {
return nil