Commit 69c7cdc5 authored by Pengfei Ni's avatar Pengfei Ni

Fix panic while provisioning Azure security group rules

parent 5ca598b4
...@@ -889,8 +889,8 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service, ...@@ -889,8 +889,8 @@ func (az *Cloud) reconcileSecurityGroup(clusterName string, service *v1.Service,
// update security rules // update security rules
dirtySg := false dirtySg := false
var updatedRules []network.SecurityRule 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 { for _, r := range updatedRules {
......
...@@ -153,6 +153,10 @@ func (az *Cloud) getAzureLoadBalancer(name string) (lb network.LoadBalancer, exi ...@@ -153,6 +153,10 @@ func (az *Cloud) getAzureLoadBalancer(name string) (lb network.LoadBalancer, exi
} }
func (az *Cloud) getSecurityGroup() (nsg network.SecurityGroup, err error) { 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) securityGroup, err := az.nsgCache.Get(az.SecurityGroupName)
if err != nil { if err != nil {
return nsg, err return nsg, err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment