Merge pull request #3424 from CecileRobertMichon/natgw-pip-name

Change default nat gateway IP name
kubernetes-sigs · Apr 14, 2023 · d662a91 · d662a91
2 parents eec7b71 + aeee6e1
commit d662a91
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/api/v1beta1/azurecluster_default.go b/api/v1beta1/azurecluster_default.go
@@ -132,7 +132,7 @@ func (c *AzureCluster) setSubnetDefaults() {
 				subnet.NatGateway.Name = withIndex(generateNatGatewayName(c.ObjectMeta.Name), nodeSubnetCounter)
 			}
 			if subnet.NatGateway.NatGatewayIP.Name == "" {
-				subnet.NatGateway.NatGatewayIP.Name = generateNatGatewayIPName(c.ObjectMeta.Name, subnet.Name)
+				subnet.NatGateway.NatGatewayIP.Name = generateNatGatewayIPName(subnet.NatGateway.Name)
 			}
 		}
 
@@ -453,8 +453,8 @@ func generateNatGatewayName(clusterName string) string {
 }
 
 // generateNatGatewayIPName generates a NAT gateway IP name.
-func generateNatGatewayIPName(clusterName, subnetName string) string {
-	return fmt.Sprintf("pip-%s-%s-natgw", clusterName, subnetName)
+func generateNatGatewayIPName(natGatewayName string) string {
+	return fmt.Sprintf("pip-%s", natGatewayName)
 }
 
 // withIndex appends the index as suffix to a generated name.

diff --git a/api/v1beta1/azurecluster_default_test.go b/api/v1beta1/azurecluster_default_test.go
@@ -370,7 +370,7 @@ func TestSubnetDefaults(t *testing.T) {
 										Name: "foo-natgw",
 									},
 									NatGatewayIP: PublicIPSpec{
-										Name: "pip-cluster-test-my-node-subnet-natgw",
+										Name: "pip-foo-natgw",
 									},
 								},
 							},
@@ -434,7 +434,7 @@ func TestSubnetDefaults(t *testing.T) {
 										Name: "cluster-test-node-natgw-1",
 									},
 									NatGatewayIP: PublicIPSpec{
-										Name: "pip-cluster-test-cluster-test-node-subnet-natgw",
+										Name: "pip-cluster-test-node-natgw-1",
 									},
 								},
 							},
@@ -500,7 +500,7 @@ func TestSubnetDefaults(t *testing.T) {
 										Name: "cluster-test-node-natgw-1",
 									},
 									NatGatewayIP: PublicIPSpec{
-										Name: "pip-cluster-test-cluster-test-node-subnet-natgw",
+										Name: "pip-cluster-test-node-natgw-1",
 									},
 								},
 							},
@@ -549,7 +549,7 @@ func TestSubnetDefaults(t *testing.T) {
 										Name: "cluster-test-node-natgw-1",
 									},
 									NatGatewayIP: PublicIPSpec{
-										Name: "pip-cluster-test-my-node-subnet-natgw",
+										Name: "pip-cluster-test-node-natgw-1",
 									},
 								},
 							},

diff --git a/azure/defaults.go b/azure/defaults.go
@@ -128,11 +128,6 @@ func GenerateFrontendIPConfigName(lbName string) string {
 	return fmt.Sprintf("%s-%s", lbName, "frontEnd")
 }
 
-// GenerateNatGatewayIPName generates a NAT gateway IP name.
-func GenerateNatGatewayIPName(clusterName, subnetName string) string {
-	return fmt.Sprintf("pip-%s-%s-natgw", clusterName, subnetName)
-}
-
 // GenerateNodeOutboundIPName generates a public IP name, based on the cluster name.
 func GenerateNodeOutboundIPName(clusterName string) string {
 	return fmt.Sprintf("pip-%s-node-outbound", clusterName)