Merge pull request #65681 from feiskyer/automated-cherry-pick-of-#65412-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #65412: skip nic that are in failing state Cherry pick of #65412 on release-1.10. #65412: skip nic that are in failing state

Merge pull request #65681 from feiskyer/automated-cherry-pick-of-#65412-upstream-release-1.10
9e5916bc · Kubernetes Submit Queue · GitHub · 37d1bb97 · b481ace3 · 9e5916bc
Unverified Commit 9e5916bc authored Jul 03, 2018 by Kubernetes Submit Queue Committed by GitHub Jul 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

azure_standard.go pkg/cloudprovider/providers/azure/azure_standard.go +7 -1

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_standard.go
+++ b/pkg/cloudprovider/providers/azure/azure_standard.go
@@ -52,7 +52,8 @@ const (
 	InternalLoadBalancerNameSuffix = "-internal"

 	// nodeLabelRole specifies the role of a node
-	nodeLabelRole = "kubernetes.io/role"
+	nodeLabelRole  = "kubernetes.io/role"
+	nicFailedState = "Failed"

 	storageAccountNameMaxLength = 24
 )
@@ -605,6 +606,11 @@ func (as *availabilitySet) ensureHostInPool(serviceName string, nodeName types.N
 		return err
 	}

+	if nic.ProvisioningState != nil && *nic.ProvisioningState == nicFailedState {
+		glog.V(3).Infof("ensureHostInPool skips node %s because its primdary nic %s is in Failed state", nodeName, nic.Name)
+		return nil
+	}
+
 	var primaryIPConfig *network.InterfaceIPConfiguration
 	primaryIPConfig, err = getPrimaryIPConfig(nic)
 	if err != nil {