github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40060 from justinsb/remove_unused_zone

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40060, 44860, 44865, 44825, 44162)

servicecontroller: remove unused zone field

The zone field was unused, and this complicated e.g. #39996

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-04-24 23:07:38 -07:00 committed by GitHub
commit badd785839
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/service/servicecontroller.go
View File

@ -86,7 +86,6 @@ type ServiceController struct {
kubeClient clientset.Interface kubeClient clientset.Interface
clusterName string clusterName string
balancer cloudprovider.LoadBalancer balancer cloudprovider.LoadBalancer
zone cloudprovider.Zone
cache *serviceCache cache *serviceCache
serviceLister corelisters.ServiceLister serviceLister corelisters.ServiceLister
serviceListerSynced cache.InformerSynced serviceListerSynced cache.InformerSynced
@ -219,15 +218,6 @@ func (s *ServiceController) init() error {
} }
s.balancer = balancer s.balancer = balancer
zones, ok := s.cloud.Zones()
if !ok {
return fmt.Errorf("the cloud provider does not support zone enumeration, which is required for creating load balancers.")
}
zone, err := zones.GetZone()
if err != nil {
return fmt.Errorf("failed to get zone from cloud provider, will not be able to create load balancers: %v", err)
}
s.zone = zone
return nil return nil
} }