Merge pull request #4611 from rpahli/external-control-plane

enable the use of an external control plane

Author: k8s-ci-robot

api/v1beta1/azurecluster_default.go

@@ -58,9 +58,16 @@ func (c *AzureCluster) setNetworkSpecDefaults() {
 	c.setBastionDefaults()
 	c.setSubnetDefaults()
 	c.setVnetPeeringDefaults()
-	c.setAPIServerLBDefaults()
+	if c.Spec.ControlPlaneEnabled {
+		c.setAPIServerLBDefaults()
+	}
 	c.SetNodeOutboundLBDefaults()
-	c.SetControlPlaneOutboundLBDefaults()
+	if c.Spec.ControlPlaneEnabled {
+		c.SetControlPlaneOutboundLBDefaults()
+	}
+	if !c.Spec.ControlPlaneEnabled {
+		c.Spec.NetworkSpec.APIServerLB = nil
+	}
 }
 
 func (c *AzureCluster) setResourceGroupDefault() {
@@ -93,16 +100,18 @@ func (c *AzureCluster) setSubnetDefaults() {
 		c.Spec.NetworkSpec.UpdateSubnet(clusterSubnet, SubnetCluster)
 	}
 
-	/* if there is a cp subnet set defaults
-	   if no cp subnet and cluster subnet create a default cp subnet */
-	cpSubnet, errcp := c.Spec.NetworkSpec.GetSubnet(SubnetControlPlane)
-	if errcp == nil {
-		cpSubnet.setControlPlaneSubnetDefaults(c.ObjectMeta.Name)
-		c.Spec.NetworkSpec.UpdateSubnet(cpSubnet, SubnetControlPlane)
-	} else if !clusterSubnetExists {
-		cpSubnet = SubnetSpec{SubnetClassSpec: SubnetClassSpec{Role: SubnetControlPlane}}
-		cpSubnet.setControlPlaneSubnetDefaults(c.ObjectMeta.Name)
-		c.Spec.NetworkSpec.Subnets = append(c.Spec.NetworkSpec.Subnets, cpSubnet)
+	if c.Spec.ControlPlaneEnabled {
+		/* if there is a cp subnet set defaults
+		   if no cp subnet and cluster subnet create a default cp subnet */
+		cpSubnet, errcp := c.Spec.NetworkSpec.GetSubnet(SubnetControlPlane)
+		if errcp == nil {
+			cpSubnet.setControlPlaneSubnetDefaults(c.ObjectMeta.Name)
+			c.Spec.NetworkSpec.UpdateSubnet(cpSubnet, SubnetControlPlane)
+		} else if !clusterSubnetExists {
+			cpSubnet = SubnetSpec{SubnetClassSpec: SubnetClassSpec{Role: SubnetControlPlane}}
+			cpSubnet.setControlPlaneSubnetDefaults(c.ObjectMeta.Name)
+			c.Spec.NetworkSpec.Subnets = append(c.Spec.NetworkSpec.Subnets, cpSubnet)
+		}
 	}
 
 	var nodeSubnetFound bool
@@ -210,7 +219,15 @@ func (c *AzureCluster) setVnetPeeringDefaults() {
 }
 
 func (c *AzureCluster) setAPIServerLBDefaults() {
-	lb := &c.Spec.NetworkSpec.APIServerLB
+	if c.Spec.NetworkSpec.APIServerLB == nil {
+		lbSpec := LoadBalancerSpec{
+			LoadBalancerClassSpec: LoadBalancerClassSpec{
+				Type: "Public",
+			},
+		}
+		c.Spec.NetworkSpec.APIServerLB = &lbSpec
+	}
+	lb := c.Spec.NetworkSpec.APIServerLB
 
 	lb.LoadBalancerClassSpec.setAPIServerLBDefaults()
 
@@ -249,7 +266,7 @@ func (c *AzureCluster) setAPIServerLBDefaults() {
 // SetNodeOutboundLBDefaults sets the default values for the NodeOutboundLB.
 func (c *AzureCluster) SetNodeOutboundLBDefaults() {
 	if c.Spec.NetworkSpec.NodeOutboundLB == nil {
-		if c.Spec.NetworkSpec.APIServerLB.Type == Internal {
+		if !c.Spec.ControlPlaneEnabled || c.Spec.NetworkSpec.APIServerLB.Type == Internal {
 			return
 		}
 
@@ -314,7 +331,7 @@ func (c *AzureCluster) SetBackendPoolNameDefault() {
 
 // SetAPIServerLBBackendPoolNameDefault defaults the name of the backend pool for apiserver LB.
 func (c *AzureCluster) SetAPIServerLBBackendPoolNameDefault() {
-	apiServerLB := &c.Spec.NetworkSpec.APIServerLB
+	apiServerLB := c.Spec.NetworkSpec.APIServerLB
 	if apiServerLB.BackendPool.Name == "" {
 		apiServerLB.BackendPool.Name = generateBackendAddressPoolName(apiServerLB.Name)
 	}