cleanup OutboundPoolName/APIServerLBName

api/v1alpha3/azurecluster_default_test.go

@@ -603,7 +603,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
 							SKU:  SKUStandard,
 							FrontendIPs: []FrontendIP{
 								{
-									Name: "cluster-test-internal-lb-frontEnd",
+									Name:             "cluster-test-internal-lb-frontEnd",
 									PrivateIPAddress: DefaultInternalLBIPAddress,
 								},
 							},

cloud/interfaces.go

@@ -66,8 +66,10 @@ type NetworkDescriber interface {
 	NodeRouteTable() *infrav1.RouteTable
 	ControlPlaneRouteTable() *infrav1.RouteTable
 	APIServerLBName() string
+	APIServerLBPoolName(string) string
 	IsAPIServerPrivate() bool
 	OutboundLBName(string) string
+	OutboundPoolName(string) string
 }
 
 // ClusterDescriber is an interface which can get common Azure Cluster information.

cloud/scope/cluster.go

@@ -137,7 +137,7 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 			Type:              s.APIServerLB().Type,
 			SKU:               infrav1.SKUStandard,
 			Role:              infrav1.APIServerRole,
-			BackendPoolName:   azure.GenerateBackendAddressPoolName(s.APIServerLB().Name),
+			BackendPoolName:   s.APIServerLBPoolName(s.APIServerLB().Name),
 		},
 		{
 			// Public Node outbound LB
@@ -152,7 +152,7 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 			},
 			Type:            infrav1.Public,
 			SKU:             infrav1.SKUStandard,
-			BackendPoolName: azure.GenerateOutboundBackendAddressPoolName(s.NodeOutboundLBName()),
+			BackendPoolName: s.OutboundPoolName(s.NodeOutboundLBName()),
 			Role:            infrav1.NodeOutboundRole,
 		},
 	}
@@ -172,9 +172,9 @@ func (s *ClusterScope) LBSpecs() []azure.LBSpec {
 				},
 			},
 		},
-		Type: infrav1.Public,
-		SKU:  infrav1.SKUStandard,
-		BackendPoolName: azure.GenerateOutboundBackendAddressPoolName(azure.GenerateControlPlaneOutboundLBName(s.ClusterName())),
+		Type:            infrav1.Public,
+		SKU:             infrav1.SKUStandard,
+		BackendPoolName: s.OutboundPoolName(azure.GenerateControlPlaneOutboundLBName(s.ClusterName())),
 		Role:            infrav1.ControlPlaneOutboundRole,
 	})
 
@@ -310,6 +310,11 @@ func (s *ClusterScope) APIServerPrivateIP() string {
 	return s.APIServerLB().FrontendIPs[0].PrivateIPAddress
 }
 
+// APIServerLBPoolName returns the API Server LB backend pool name.
+func (s *ClusterScope) APIServerLBPoolName(loadBalancerName string) string {
+	return azure.GenerateBackendAddressPoolName(loadBalancerName)
+}
+
 // NodeOutboundLBName returns the name of the node outbound LB.
 func (s *ClusterScope) NodeOutboundLBName() string {
 	return s.ClusterName()
@@ -326,6 +331,11 @@ func (s *ClusterScope) OutboundLBName(role string) string {
 	return s.APIServerLBName()
 }
 
+// OutboundPoolName returns the outbound LB backend pool name.
+func (s *ClusterScope) OutboundPoolName(loadBalancerName string) string {
+	return azure.GenerateOutboundBackendAddressPoolName(loadBalancerName)
+}
+
 // ResourceGroup returns the cluster resource group.
 func (s *ClusterScope) ResourceGroup() string {
 	return s.AzureCluster.Spec.ResourceGroup

cloud/scope/machine.go

@@ -155,15 +155,15 @@ func (m *MachineScope) NICSpecs() []azure.NICSpec {
 		IPv6Enabled:             m.IsIPv6Enabled(),
 		EnableIPForwarding:      m.AzureMachine.Spec.EnableIPForwarding,
 		PublicLBName:            m.OutboundLBName(m.Role()),
-		PublicLBAddressPoolName: azure.GenerateOutboundBackendAddressPoolName(m.OutboundLBName(m.Role())),
+		PublicLBAddressPoolName: m.OutboundPoolName(m.OutboundLBName(m.Role())),
 	}
 	if m.Role() == infrav1.ControlPlane {
 		if m.IsAPIServerPrivate() {
 			spec.InternalLBName = m.APIServerLBName()
-			spec.InternalLBAddressPoolName = azure.GenerateBackendAddressPoolName(m.APIServerLBName())
+			spec.InternalLBAddressPoolName = m.APIServerLBPoolName(m.APIServerLBName())
 		} else {
 			spec.PublicLBNATRuleName = m.Name()
-			spec.PublicLBAddressPoolName = azure.GenerateBackendAddressPoolName(m.APIServerLBName())
+			spec.PublicLBAddressPoolName = m.APIServerLBPoolName(m.APIServerLBName())
 		}
 	}
 	specs := []azure.NICSpec{spec}

cloud/scope/managedcontrolplane.go

@@ -215,7 +215,12 @@ func (s *ManagedControlPlaneScope) IsVnetManaged() bool {
 
 // APIServerLBName returns the API Server LB name.
 func (s *ManagedControlPlaneScope) APIServerLBName() string {
-	return ""
+	return "" // does not apply for AKS
+}
+
+// APIServerLBPoolName returns the API Server LB backend pool name.
+func (s *ManagedControlPlaneScope) APIServerLBPoolName(loadBalancerName string) string {
+	return "" // does not apply for AKS
 }
 
 // IsAPIServerPrivate returns true if the API Server LB is of type Internal.
@@ -226,6 +231,11 @@ func (s *ManagedControlPlaneScope) IsAPIServerPrivate() bool {
 
 // OutboundLBName returns the name of the outbound LB.
 // Note: for managed clusters, the outbound LB lifecycle is not managed.
-func (s *ManagedControlPlaneScope) OutboundLBName(string) string {
+func (s *ManagedControlPlaneScope) OutboundLBName(_ string) string {
 	return "kubernetes"
 }
+
+// OutboundPoolName returns the outbound LB backend pool name.
+func (s *ManagedControlPlaneScope) OutboundPoolName(_ string) string {
+	return "aksOutboundBackendPool" // hard-coded in aks
+}