Merge pull request #58676 from feiskyer/fix-58675

Automatic merge from submit-queue (batch tested with PRs 58697, 58658, 58676, 58674). 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>. Fix possible panic when getting Azure primary IPConfig **What this PR does / why we need it**: kube-controller-manager panic when removing a lot of nodes from kubernetes cluster (see #58675). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #58675 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #58676 from feiskyer/fix-58675
dc1843eb · Kubernetes Submit Queue · GitHub · ea2154fb · c0e62963 · dc1843eb
Unverified Commit dc1843eb authored Jan 23, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

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

azure_vmss.go pkg/cloudprovider/providers/azure/azure_vmss.go +2 -2

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_standard.go
+++ b/pkg/cloudprovider/providers/azure/azure_standard.go
@@ -221,6 +221,10 @@ func getPrimaryInterfaceID(machine compute.VirtualMachine) (string, error) {
 }

 func getPrimaryIPConfig(nic network.Interface) (*network.InterfaceIPConfiguration, error) {
+	if nic.IPConfigurations == nil {
+		return nil, fmt.Errorf("nic.IPConfigurations for nic (nicname=%q) is nil", *nic.Name)
+	}
+
 	if len(*nic.IPConfigurations) == 1 {
 		return &((*nic.IPConfigurations)[0]), nil
 	}
@@ -231,7 +235,7 @@ func getPrimaryIPConfig(nic network.Interface) (*network.InterfaceIPConfiguratio
 		}
 	}

-	return nil, fmt.Errorf("failed to determine the determine primary ipconfig. nicname=%q", *nic.Name)
+	return nil, fmt.Errorf("failed to determine the primary ipconfig. nicname=%q", *nic.Name)
 }

 func isInternalLoadBalancer(lb *network.LoadBalancer) bool {

--- a/pkg/cloudprovider/providers/azure/azure_vmss.go
+++ b/pkg/cloudprovider/providers/azure/azure_vmss.go
@@ -785,11 +785,11 @@ func (ss *scaleSet) EnsureHostsInPool(serviceName string, nodes []*v1.Node, back
 	for _, curNode := range nodes {
 		curScaleSetName, err := extractScaleSetNameByVMID(curNode.Spec.ExternalID)
 		if err != nil {
-			glog.V(2).Infof("Node %q is not belonging to any scale sets, omitting it", curNode.Name)
+			glog.V(4).Infof("Node %q is not belonging to any scale sets, omitting it", curNode.Name)
 			continue
 		}
 		if curScaleSetName != vmSetName {
-			glog.V(2).Infof("Node %q is not belonging to scale set %q, omitting it", curNode.Name, vmSetName)
+			glog.V(4).Infof("Node %q is not belonging to scale set %q, omitting it", curNode.Name, vmSetName)
 			continue
 		}