Merge pull request #1491 from shysank/natgwipname_default

set natgateway ip name in defaults

Author: k8s-ci-robot

api/v1alpha4/azurecluster_default.go

@@ -118,6 +118,12 @@ func (c *AzureCluster) setSubnetDefaults() {
 		nodeSubnet.RouteTable.Name = generateNodeRouteTableName(c.ObjectMeta.Name)
 	}
 
+	if nodeSubnet.NatGateway.Name != "" {
+		if nodeSubnet.NatGateway.NatGatewayIP.Name == "" {
+			nodeSubnet.NatGateway.NatGatewayIP.Name = generateNatGatewayIPName(c.ObjectMeta.Name, nodeSubnet.Name)
+		}
+	}
+
 	c.Spec.NetworkSpec.UpdateControlPlaneSubnet(cpSubnet)
 	c.Spec.NetworkSpec.UpdateNodeSubnet(nodeSubnet)
 }
@@ -356,6 +362,11 @@ func generateControlPlaneOutboundIPName(clusterName string) string {
 	return fmt.Sprintf("pip-%s-controlplane-outbound", clusterName)
 }
 
+// generateNatGatewayIPName generates a nat gateway IP name.
+func generateNatGatewayIPName(clusterName, subnetName string) string {
+	return fmt.Sprintf("pip-%s-%s-natgw", clusterName, subnetName)
+}
+
 // withIndex appends the index as suffix to a generated name.
 func withIndex(name string, n int) string {
 	return fmt.Sprintf("%s-%d", name, n)

api/v1alpha4/azurecluster_default_test.go

@@ -301,6 +301,7 @@ func TestSubnetDefaults(t *testing.T) {
 								Role:       SubnetNode,
 								Name:       "my-node-subnet",
 								CIDRBlocks: []string{"10.1.0.16/24"},
+								NatGateway: NatGateway{Name: "foo-natgw"},
 							},
 						},
 					},
@@ -326,6 +327,12 @@ func TestSubnetDefaults(t *testing.T) {
 								CIDRBlocks:    []string{"10.1.0.16/24"},
 								SecurityGroup: SecurityGroup{Name: "cluster-test-node-nsg"},
 								RouteTable:    RouteTable{Name: "cluster-test-node-routetable"},
+								NatGateway: NatGateway{
+									Name: "foo-natgw",
+									NatGatewayIP: PublicIPSpec{
+										Name: "pip-cluster-test-my-node-subnet-natgw",
+									},
+								},
 							},
 						},
 					},

azure/scope/cluster.go

@@ -144,7 +144,7 @@ func (s *ClusterScope) PublicIPSpecs() []azure.PublicIPSpec {
 	nodeNatGateway := s.NodeNatGateway()
 	if nodeNatGateway.Name != "" {
 		nodeNatGatewayIPSpecs = append(nodeNatGatewayIPSpecs, azure.PublicIPSpec{
-			Name:    s.GetNodeNatGatewayIPName(),
+			Name:    nodeNatGateway.NatGatewayIP.Name,
 			DNSName: nodeNatGateway.NatGatewayIP.DNSName,
 		})
 	}
@@ -220,17 +220,6 @@ func (s *ClusterScope) RouteTableSpecs() []azure.RouteTableSpec {
 	return routetables
 }
 
-// GetNodeNatGatewayIPName returns the node nat gateway IP name if defined, or a generated name if it's not.
-func (s *ClusterScope) GetNodeNatGatewayIPName() string {
-	natGateway := s.NodeNatGateway()
-	natGatewayIPName := azure.GenerateNatGatewayIPName(s.ClusterName(), s.NodeSubnet().Name)
-	if natGateway.NatGatewayIP.Name != "" {
-		natGatewayIPName = natGateway.NatGatewayIP.Name
-	}
-
-	return natGatewayIPName
-}
-
 // NatGatewaySpecs returns the node nat gateway.
 func (s *ClusterScope) NatGatewaySpecs() []azure.NatGatewaySpec {
 	natGateways := []azure.NatGatewaySpec{}
@@ -241,7 +230,7 @@ func (s *ClusterScope) NatGatewaySpecs() []azure.NatGatewaySpec {
 		natGateways = append(natGateways, azure.NatGatewaySpec{
 			Name: natGateway.Name,
 			NatGatewayIP: infrav1.PublicIPSpec{
-				Name: s.GetNodeNatGatewayIPName(),
+				Name: natGateway.NatGatewayIP.Name,
 			},
 			Subnet: s.NodeSubnet(),
 		})