From 8f52d8232b035dbc12c1ed925af1a515f351eaa7 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Tue, 5 Jun 2018 13:41:23 +0800 Subject: [PATCH] Fix panic while provisioning Azure security group rules --- pkg/cloudprovider/providers/azure/azure_loadbalancer.go | 4 ++-- pkg/cloudprovider/providers/azure/azure_wrap.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go index dcf398ae9a..fca68fbb40 100644 --- 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 { - updatedRules = *sg.SecurityRules + if sg.SecurityGroupPropertiesFormat != nil && sg.SecurityGroupPropertiesFormat.SecurityRules != nil { + updatedRules = *sg.SecurityGroupPropertiesFormat.SecurityRules } for _, r := range updatedRules { diff --git a/pkg/cloudprovider/providers/azure/azure_wrap.go b/pkg/cloudprovider/providers/azure/azure_wrap.go index 53c17871e8..a02ebae93b 100644 --- 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