Merge pull request #71597 from…

Merge pull request #71597 from marc-sensenich/gh-71595/fix-cloud-controller-manager-azure-delete-nodes Add check for cloudProvider.InstanceNotFound in Azure VMSS Instance gets

Merge pull request #71597 from…
a605988d · Kubernetes Prow Robot · GitHub · 85b0f583 · 884b21f3 · a605988d
Unverified Commit a605988d authored Dec 04, 2018 by Kubernetes Prow Robot Committed by GitHub Dec 04, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

azure_instances.go pkg/cloudprovider/providers/azure/azure_instances.go +4 -2

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_instances.go
+++ b/pkg/cloudprovider/providers/azure/azure_instances.go
@@ -23,9 +23,8 @@ import (
 	"strings"

 	"k8s.io/api/core/v1"
-	cloudprovider "k8s.io/cloud-provider"
-
 	"k8s.io/apimachinery/pkg/types"
+	cloudprovider "k8s.io/cloud-provider"
 	"k8s.io/klog"
 )

@@ -155,6 +154,9 @@ func (az *Cloud) InstanceExistsByProviderID(ctx context.Context, providerID stri

 	name, err := az.vmSet.GetNodeNameByProviderID(providerID)
 	if err != nil {
+		if err == cloudprovider.InstanceNotFound {
+			return false, nil
+		}
 		return false, err
 	}