DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Get rid of default-zone everywhere.

Browse source
This commit is contained in:
Prashanth Balasubramanian 2016-06-03 11:22:56 -07:00
parent 3bed62f51e
commit 61558f4d19
6 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
controllers/gce/controller/cluster_manager.go
View file

@ -261,13 +261,9 @@ func NewClusterManager(
// Names are fundamental to the cluster, the uid allocator makes sure names don't collide.
cluster := ClusterManager{ClusterNamer: &utils.Namer{name}}
zone, err := cloud.GetZone()
if err != nil {
return nil, err
}
// NodePool stores GCE vms that are in this Kubernetes cluster.
cluster.instancePool = instances.NewNodePool(cloud, zone.FailureDomain)
cluster.instancePool = instances.NewNodePool(cloud)
// BackendPool creates GCE BackendServices and associated health checks.
healthChecker := healthchecks.NewHealthChecker(cloud, defaultHealthCheckPath, cluster.ClusterNamer)

2
controllers/gce/controller/fakes.go
View file

@ -50,7 +50,7 @@ func NewFakeClusterManager(clusterName string) *fakeClusterManager {
fakeHCs := healthchecks.NewFakeHealthChecks()
namer := &utils.Namer{clusterName}
nodePool := instances.NewNodePool(fakeIGs, defaultZone)
nodePool := instances.NewNodePool(fakeIGs)
nodePool.Init(&instances.FakeZoneLister{[]string{"zone-a"}})
healthChecker := healthchecks.NewHealthChecker(fakeHCs, "/", namer)