From ec12fe1e8427980aed3de8a1f48c63957119ff3a Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Sat, 26 May 2018 22:29:36 -0700 Subject: [PATCH] ccm: recognize InstanceNotFound from InstanceID Otherwise we won't actually delete Nodes in this code path. --- pkg/controller/cloud/node_controller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/controller/cloud/node_controller.go b/pkg/controller/cloud/node_controller.go index 0867ee8bbbc..cf38936f366 100644 --- a/pkg/controller/cloud/node_controller.go +++ b/pkg/controller/cloud/node_controller.go @@ -445,6 +445,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 }