Merge pull request #64739 from feiskyer/az-nsg

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>. Fix panic while provisioning Azure security group rules **What this PR does / why we need it**: kube-controller-manager panic when provisioning Azure security group rules, especially when securityGroupName is wrong configured. This PR fixes the issue. **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 #64716 **Special notes for your reviewer**: Should also cherry pick to release-1.10. **Release note**: ```release-note Fix kube-controller-manager panic while provisioning Azure security group rules ```

Merge pull request #64739 from feiskyer/az-nsg
def5179c · Kubernetes Submit Queue · GitHub · 0f9dfca8 · 8f52d823 · def5179c
Unverified Commit def5179c authored Jun 05, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

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

azure_wrap.go pkg/cloudprovider/providers/azure/azure_wrap.go +4 -0

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
+++ b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
@@ -926,8 +926,8 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
 	// update security rules
 	dirtySg := false
 	var updatedRules []network.SecurityRule
-	if sg.SecurityRules != nil {
+	if sg.SecurityGroupPropertiesFormat != nil && sg.SecurityGroupPropertiesFormat.SecurityRules != nil {
-		updatedRules = *sg.SecurityRules
+		updatedRules = *sg.SecurityGroupPropertiesFormat.SecurityRules
 	}
 	for _, r := range updatedRules {

--- a/pkg/cloudprovider/providers/azure/azure_wrap.go
+++ b/pkg/cloudprovider/providers/azure/azure_wrap.go
@@ -163,6 +163,10 @@ func (az *Cloud) getAzureLoadBalancer(name string) (lb network.LoadBalancer, exi
 }
 func (az *Cloud) getSecurityGroup() (nsg network.SecurityGroup, err error) {
+	if az.SecurityGroupName == "" {
+		return nsg, fmt.Errorf("securityGroupName is not configured")
+	}
 	securityGroup, err := az.nsgCache.Get(az.SecurityGroupName)
 	if err != nil {
 		return nsg, err