Merge pull request #34831 from dcbw/multizone-gce-instances

Automatic merge from submit-queue cloudprovider/gce: canonicalize instance name when returning instance array 'names' is an array of FQDNs. 'instances' is a map indexed by canonicalized name. Clearly these two won't always match, so when building the final instance array to return, make sure to look up map entries by their canonicalized name. In the below example, "ocp-master-5pob" is clearly found as a GCE instance but when building the final instance array it cannot be matched as the code is looking for "ocp-master-5pob.c.ose-refarch.internal" instead. The node is then deleted from the cluster as it cannot be found by the cloud provider. ``` gce.go:2519] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): initial node prefix ocp- gce.go:2530] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): looking for instances map[ocp-master-5pob:<nil>] gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-c' (remaining 1) gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): instance name <omitted> not requested gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): instance name <omitted> not requested gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-b' (remaining 1) gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): instance name <omitted> not requested gce.go:2576] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): found instance 'ocp-master-5pob' remaining 0 gce.go:2563] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): instance name <omitted> not requested gce.go:2533] ### getInstancesByNames([ocp-master-5pob.c.ose-refarch.internal]): getting zone 'europe-west1-d' (remaining 0) gce.go:2588] Failed to retrieve instance: "ocp-master-5pob.c.ose-refarch.internal" gce.go:2624] ### getInstanceByName(ocp-master-5pob.c.ose-refarch.internal): got []: instance not found gce.go:2626] getInstanceByName/multiple-zones: failed to get instance ocp-master-5pob.c.ose-refarch.internal; err: instance not found nodecontroller.go:587] Deleting node (no longer present in cloud provider): ocp-master-5pob.c.ose-refarch.internal nodecontroller.go:664] Recording Deleting Node ocp-master-5pob.c.ose-refarch.internal because it's not present according to cloud provider event message for node ocp-master-5pob.c.ose-refarch.internal ```

Merge pull request #34831 from dcbw/multizone-gce-instances
a9192ff4 · Kubernetes Submit Queue · GitHub · 7007064e · 40cefcaf · a9192ff4
Commit a9192ff4 authored Oct 19, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

gce.go pkg/cloudprovider/providers/gce/gce.go +1 -0

No files found.
--- a/pkg/cloudprovider/providers/gce/gce.go
+++ b/pkg/cloudprovider/providers/gce/gce.go
@@ -2832,6 +2832,7 @@ func (gce *GCECloud) getInstancesByNames(names []string) ([]*gceInstance, error)

 	instanceArray := make([]*gceInstance, len(names))
 	for i, name := range names {
+		name = canonicalizeInstanceName(name)
 		instance := instances[name]
 		if instance == nil {
 			glog.Errorf("Failed to retrieve instance: %q", name)