Merge pull request #64368 from justinsb/ccm_instanceid_fix

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. ccm: recognize InstanceNotFound from InstanceID Otherwise we won't actually delete Nodes in this code path. ```release-note NONE ```

Merge pull request #64368 from justinsb/ccm_instanceid_fix
0757e05e · Kubernetes Submit Queue · GitHub · 54900d77 · ec12fe1e · 0757e05e
Unverified Commit 0757e05e authored Jun 02, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

node_controller.go pkg/controller/cloud/node_controller.go +3 -0

No files found.
--- a/pkg/controller/cloud/node_controller.go
+++ b/pkg/controller/cloud/node_controller.go
@@ -449,6 +449,9 @@ func ensureNodeExistsByProviderID(instances cloudprovider.Instances, node *v1.No
 		var err error
 		providerID, err = instances.InstanceID(context.TODO(), types.NodeName(node.Name))
 		if err != nil {
+			if err == cloudprovider.InstanceNotFound {
+				return false, nil
+			}
 			return false, err
 		}