Merge pull request #15668 from hakman/azure_nsg_spurious_changes

azure: Avoid spurious changes in NetworkSecurityGroup
kubernetes · Jul 19, 2023 · 684cf84 · 684cf84
2 parents d5c2458 + dcd13c9
commit 684cf84
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go b/upup/pkg/fi/cloudup/azuretasks/networksecuritygroup.go
@@ -79,17 +79,21 @@ func (nsg *NetworkSecurityGroup) Find(c *fi.CloudupContext) (*NetworkSecurityGro
 	}
 	for _, rule := range *found.SecurityRules {
 		nsr := &NetworkSecurityRule{
-			Name:                       rule.Name,
-			Priority:                   rule.Priority,
-			Access:                     rule.Access,
-			Direction:                  rule.Direction,
-			Protocol:                   rule.Protocol,
-			SourceAddressPrefix:        rule.SourceAddressPrefix,
-			SourceAddressPrefixes:      rule.SourceAddressPrefixes,
-			SourcePortRange:            rule.SourcePortRange,
-			DestinationAddressPrefix:   rule.DestinationAddressPrefix,
-			DestinationAddressPrefixes: rule.DestinationAddressPrefixes,
-			DestinationPortRange:       rule.DestinationPortRange,
+			Name:                     rule.Name,
+			Priority:                 rule.Priority,
+			Access:                   rule.Access,
+			Direction:                rule.Direction,
+			Protocol:                 rule.Protocol,
+			SourceAddressPrefix:      rule.SourceAddressPrefix,
+			SourcePortRange:          rule.SourcePortRange,
+			DestinationAddressPrefix: rule.DestinationAddressPrefix,
+			DestinationPortRange:     rule.DestinationPortRange,
+		}
+		if rule.SourceAddressPrefixes != nil && len(*rule.SourceAddressPrefixes) > 0 {
+			nsr.SourceAddressPrefixes = rule.SourceAddressPrefixes
+		}
+		if rule.DestinationAddressPrefixes != nil && len(*rule.DestinationAddressPrefixes) > 0 {
+			nsr.DestinationAddressPrefixes = rule.DestinationAddressPrefixes
 		}
 		actual.SecurityRules = append(actual.SecurityRules, nsr)
 	}