Merge pull request #2072 from ykakarap/clusterclass-support

Add AzureClusterTemplate type

Author: k8s-ci-robot

PROJECT

@@ -29,3 +29,6 @@ resources:
 - group: infrastructure
   version: v1beta1
   kind: AzureMachineTemplate
+- group: infrastructure
+  version: v1beta1
+  kind: AzureClusterTemplate

api/v1alpha3/azurecluster_conversion.go

@@ -58,9 +58,7 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error {
 	// set default control plane outbound lb for private v1alpha3 clusters
 	if src.Spec.NetworkSpec.APIServerLB.Type == Internal && restored.Spec.NetworkSpec.ControlPlaneOutboundLB == nil {
 		dst.Spec.NetworkSpec.ControlPlaneOutboundLB = &infrav1beta1.LoadBalancerSpec{
-			LoadBalancerClassSpec: infrav1beta1.LoadBalancerClassSpec{
-				FrontendIPsCount: pointer.Int32Ptr(1),
-			},
+			FrontendIPsCount: pointer.Int32Ptr(1),
 		}
 	} else {
 		dst.Spec.NetworkSpec.ControlPlaneOutboundLB = restored.Spec.NetworkSpec.ControlPlaneOutboundLB
@@ -69,9 +67,7 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error {
 	// set default node plane outbound lb for all v1alpha3 clusters
 	if restored.Spec.NetworkSpec.NodeOutboundLB == nil {
 		dst.Spec.NetworkSpec.NodeOutboundLB = &infrav1beta1.LoadBalancerSpec{
-			LoadBalancerClassSpec: infrav1beta1.LoadBalancerClassSpec{
-				FrontendIPsCount: pointer.Int32Ptr(1),
-			},
+			FrontendIPsCount: pointer.Int32Ptr(1),
 		}
 	} else {
 		dst.Spec.NetworkSpec.NodeOutboundLB = restored.Spec.NetworkSpec.NodeOutboundLB

api/v1alpha3/conversion_test.go

@@ -88,12 +88,10 @@ func overrideOutboundLBFunc(codecs runtimeserializer.CodecFactory) []interface{}
 	return []interface{}{
 		func(networkSpec *v1beta1.NetworkSpec, c fuzz.Continue) {
 			networkSpec.ControlPlaneOutboundLB = &v1beta1.LoadBalancerSpec{
-				LoadBalancerClassSpec: v1beta1.LoadBalancerClassSpec{
-					FrontendIPsCount: pointer.Int32Ptr(1)},
+				FrontendIPsCount: pointer.Int32Ptr(1),
 			}
 			networkSpec.NodeOutboundLB = &v1beta1.LoadBalancerSpec{
-				LoadBalancerClassSpec: v1beta1.LoadBalancerClassSpec{
-					FrontendIPsCount: pointer.Int32Ptr(1)},
+				FrontendIPsCount: pointer.Int32Ptr(1),
 			}
 		},
 	}

api/v1alpha3/zz_generated.conversion.go

@@ -279,3 +279,23 @@ func Convert_v1beta1_SecurityGroup_To_v1alpha4_SecurityGroup(in *infrav1beta1.Se
 
 	return nil
 }
+
+func Convert_v1alpha4_NatGateway_To_v1beta1_NatGateway(in *NatGateway, out *infrav1beta1.NatGateway, s apiconversion.Scope) error { //nolint
+	if err := autoConvert_v1alpha4_NatGateway_To_v1beta1_NatGateway(in, out, s); err != nil {
+		return err
+	}
+
+	// Convert Name field
+	out.Name = in.Name
+	return nil
+}
+
+func Convert_v1beta1_NatGateway_To_v1alpha4_NatGateway(in *infrav1beta1.NatGateway, out *NatGateway, s apiconversion.Scope) error { //nolint
+	if err := autoConvert_v1beta1_NatGateway_To_v1alpha4_NatGateway(in, out, s); err != nil {
+		return err
+	}
+
+	// Convert Name field
+	out.Name = in.Name
+	return nil
+}

api/v1alpha4/azurecluster_conversion.go

@@ -160,15 +160,8 @@ func (c *AzureCluster) setVnetPeeringDefaults() {
 
 func (c *AzureCluster) setAPIServerLBDefaults() {
 	lb := &c.Spec.NetworkSpec.APIServerLB
-	if lb.Type == "" {
-		lb.Type = Public
-	}
-	if lb.SKU == "" {
-		lb.SKU = SKUStandard
-	}
-	if lb.IdleTimeoutInMinutes == nil {
-		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
-	}
+
+	lb.LoadBalancerClassSpec.setAPIServerLBDefaults()
 
 	if lb.Type == Public {
 		if lb.Name == "" {
@@ -226,13 +219,9 @@ func (c *AzureCluster) setNodeOutboundLBDefaults() {
 	}
 
 	lb := c.Spec.NetworkSpec.NodeOutboundLB
-	lb.Type = Public
-	lb.SKU = SKUStandard
-	lb.Name = c.ObjectMeta.Name
+	lb.LoadBalancerClassSpec.setNodeOutboundLBDefaults()
 
-	if lb.IdleTimeoutInMinutes == nil {
-		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
-	}
+	lb.Name = c.ObjectMeta.Name
 
 	if lb.FrontendIPsCount == nil {
 		lb.FrontendIPsCount = pointer.Int32Ptr(1)
@@ -242,32 +231,19 @@ func (c *AzureCluster) setNodeOutboundLBDefaults() {
 }
 
 func (c *AzureCluster) setControlPlaneOutboundLBDefaults() {
-	// public clusters don't need control plane outbound lb
-	if c.Spec.NetworkSpec.APIServerLB.Type == Public {
-		return
-	}
+	lb := c.Spec.NetworkSpec.ControlPlaneOutboundLB
 
-	// private clusters can disable control plane outbound lb by setting it to nil.
-	if c.Spec.NetworkSpec.ControlPlaneOutboundLB == nil {
+	if lb == nil {
 		return
 	}
 
-	lb := c.Spec.NetworkSpec.ControlPlaneOutboundLB
-	lb.Type = Public
-	lb.SKU = SKUStandard
-
+	lb.LoadBalancerClassSpec.setControlPlaneOutboundLBDefaults()
 	if lb.Name == "" {
 		lb.Name = generateControlPlaneOutboundLBName(c.ObjectMeta.Name)
 	}
-
-	if lb.IdleTimeoutInMinutes == nil {
-		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
-	}
-
 	if lb.FrontendIPsCount == nil {
 		lb.FrontendIPsCount = pointer.Int32Ptr(1)
 	}
-
 	c.setOutboundLBFrontendIPs(lb, generateControlPlaneOutboundIPName)
 }
 
@@ -321,6 +297,53 @@ func (c *AzureCluster) setBastionDefaults() {
 	}
 }
 
+func (lb *LoadBalancerClassSpec) setAPIServerLBDefaults() {
+	if lb.Type == "" {
+		lb.Type = Public
+	}
+	if lb.SKU == "" {
+		lb.SKU = SKUStandard
+	}
+	if lb.IdleTimeoutInMinutes == nil {
+		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
+	}
+}
+
+func (lb *LoadBalancerClassSpec) setNodeOutboundLBDefaults() {
+	lb.setOutboundLBDefaults()
+}
+
+func (lb *LoadBalancerClassSpec) setControlPlaneOutboundLBDefaults() {
+	lb.setOutboundLBDefaults()
+}
+
+func (lb *LoadBalancerClassSpec) setOutboundLBDefaults() {
+	lb.Type = Public
+	lb.SKU = SKUStandard
+	if lb.IdleTimeoutInMinutes == nil {
+		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
+	}
+}
+
+func setControlPlaneOutboundLBDefaults(lb *LoadBalancerClassSpec, apiserverLBType LBType) {
+	// public clusters don't need control plane outbound lb
+	if apiserverLBType == Public {
+		return
+	}
+
+	// private clusters can disable control plane outbound lb by setting it to nil.
+	if lb == nil {
+		return
+	}
+
+	lb.Type = Public
+	lb.SKU = SKUStandard
+
+	if lb.IdleTimeoutInMinutes == nil {
+		lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
+	}
+}
+
 // generateVnetName generates a virtual network name, based on the cluster name.
 func generateVnetName(clusterName string) string {
 	return fmt.Sprintf("%s-%s", clusterName, "vnet")