Reviews

api/v1beta1/azuremanagedcontrolplane_default.go

@@ -218,9 +218,3 @@ func (m *AzureManagedControlPlane) setDefaultAKSExtensions() {
 		}
 	}
 }
-
-func (m *AzureManagedControlPlane) setDefaultEnablePreviewFeatures() {
-	if m.Spec.EnablePreviewFeatures == nil {
-		m.Spec.EnablePreviewFeatures = ptr.To(false)
-	}
-}

api/v1beta1/azuremanagedcontrolplane_webhook.go

@@ -81,6 +81,7 @@ func (mw *azureManagedControlPlaneWebhook) Default(ctx context.Context, obj runt
 	setDefault[*Identity](&m.Spec.Identity, &Identity{
 		Type: ManagedControlPlaneIdentityTypeSystemAssigned,
 	})
+	setDefault[*bool](&m.Spec.EnablePreviewFeatures, ptr.To(false))
 	m.Spec.Version = setDefaultVersion(m.Spec.Version)
 	m.Spec.SKU = setDefaultSku(m.Spec.SKU)
 	m.Spec.AutoScalerProfile = setDefaultAutoScalerProfile(m.Spec.AutoScalerProfile)
@@ -97,7 +98,6 @@ func (mw *azureManagedControlPlaneWebhook) Default(ctx context.Context, obj runt
 	m.setDefaultOIDCIssuerProfile()
 	m.setDefaultDNSPrefix()
 	m.setDefaultAKSExtensions()
-	m.setDefaultEnablePreviewFeatures()
 
 	return nil
 }

api/v1beta1/azuremanagedcontrolplanetemplate_default.go

@@ -25,6 +25,7 @@ import (
 func (mcp *AzureManagedControlPlaneTemplate) setDefaults() {
 	setDefault[*string](&mcp.Spec.Template.Spec.NetworkPlugin, ptr.To(AzureNetworkPluginName))
 	setDefault[*string](&mcp.Spec.Template.Spec.LoadBalancerSKU, ptr.To("Standard"))
+	setDefault[*bool](&mcp.Spec.Template.Spec.EnablePreviewFeatures, ptr.To(false))
 
 	if mcp.Spec.Template.Spec.Version != "" && !strings.HasPrefix(mcp.Spec.Template.Spec.Version, "v") {
 		mcp.Spec.Template.Spec.Version = setDefaultVersion(mcp.Spec.Template.Spec.Version)

api/v1beta1/azuremanagedcontrolplanetemplate_webhook_test.go

@@ -41,6 +41,7 @@ func TestControlPlaneTemplateDefaultingWebhook(t *testing.T) {
 	g.Expect(amcpt.Spec.Template.Spec.VirtualNetwork.Subnet.Name).To(Equal("fooName"))
 	g.Expect(amcpt.Spec.Template.Spec.VirtualNetwork.Subnet.CIDRBlock).To(Equal(defaultAKSNodeSubnetCIDR))
 	g.Expect(amcpt.Spec.Template.Spec.SKU.Tier).To(Equal(FreeManagedControlPlaneTier))
+	g.Expect(*amcpt.Spec.Template.Spec.EnablePreviewFeatures).To(BeFalse())
 
 	t.Logf("Testing amcp defaulting webhook with baseline")
 	netPlug := "kubenet"
@@ -53,6 +54,7 @@ func TestControlPlaneTemplateDefaultingWebhook(t *testing.T) {
 	amcpt.Spec.Template.Spec.VirtualNetwork.Name = "fooVnetName"
 	amcpt.Spec.Template.Spec.VirtualNetwork.Subnet.Name = "fooSubnetName"
 	amcpt.Spec.Template.Spec.SKU.Tier = PaidManagedControlPlaneTier
+	amcpt.Spec.Template.Spec.EnablePreviewFeatures = ptr.To(true)
 
 	err = mcptw.Default(context.Background(), amcpt)
 	g.Expect(err).NotTo(HaveOccurred())
@@ -63,6 +65,7 @@ func TestControlPlaneTemplateDefaultingWebhook(t *testing.T) {
 	g.Expect(amcpt.Spec.Template.Spec.VirtualNetwork.Name).To(Equal("fooVnetName"))
 	g.Expect(amcpt.Spec.Template.Spec.VirtualNetwork.Subnet.Name).To(Equal("fooSubnetName"))
 	g.Expect(amcpt.Spec.Template.Spec.SKU.Tier).To(Equal(StandardManagedControlPlaneTier))
+	g.Expect(*amcpt.Spec.Template.Spec.EnablePreviewFeatures).To(BeTrue())
 }
 
 func TestControlPlaneTemplateUpdateWebhook(t *testing.T) {

azure/scope/managedcontrolplane.go

@@ -564,6 +564,7 @@ func (s *ManagedControlPlaneScope) ManagedClusterSpec() azure.ASOResourceSpecGet
 		NetworkPluginMode:           s.ControlPlane.Spec.NetworkPluginMode,
 		DNSPrefix:                   s.ControlPlane.Spec.DNSPrefix,
 		Patches:                     s.ControlPlane.Spec.ASOManagedClusterPatches,
+		Preview:                     ptr.Deref(s.ControlPlane.Spec.EnablePreviewFeatures, false),
 	}
 
 	if s.ControlPlane.Spec.SSHPublicKey != nil {
@@ -686,10 +687,6 @@ func (s *ManagedControlPlaneScope) ManagedClusterSpec() azure.ASOResourceSpecGet
 		managedClusterSpec.SecurityProfile = s.getManagedClusterSecurityProfile()
 	}
 
-	if s.ControlPlane.Spec.EnablePreviewFeatures != nil {
-		managedClusterSpec.Preview = *s.ControlPlane.Spec.EnablePreviewFeatures
-	}
-
 	return &managedClusterSpec
 }
 

azure/scope/managedmachinepool.go

@@ -198,6 +198,7 @@ func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
 		EnableFIPS:             managedMachinePool.Spec.EnableFIPS,
 		EnableEncryptionAtHost: managedMachinePool.Spec.EnableEncryptionAtHost,
 		Patches:                managedMachinePool.Spec.ASOManagedClustersAgentPoolPatches,
+		Preview:                ptr.Deref(managedControlPlane.Spec.EnablePreviewFeatures, false),
 	}
 
 	if managedMachinePool.Spec.OSDiskSizeGB != nil {
@@ -240,10 +241,6 @@ func buildAgentPoolSpec(managedControlPlane *infrav1.AzureManagedControlPlane,
 		}
 	}
 
-	if managedControlPlane.Spec.EnablePreviewFeatures != nil {
-		agentPoolSpec.Preview = *managedControlPlane.Spec.EnablePreviewFeatures
-	}
-
 	return agentPoolSpec
 }
 

azure/scope/managedmachinepool_test.go

@@ -900,107 +900,42 @@ func TestManagedMachinePoolScope_KubeletDiskType(t *testing.T) {
 }
 
 func TestManagedMachinePoolScope_EnablePreviewFeatures(t *testing.T) {
-	scheme := runtime.NewScheme()
-	_ = expv1.AddToScheme(scheme)
-	_ = infrav1.AddToScheme(scheme)
-
 	cases := []struct {
-		Name     string
-		Input    ManagedMachinePoolScopeParams
-		Expected bool
+		Name           string
+		previewEnabled *bool
+		Expected       bool
 	}{
 		{
-			Name: "Without EnablePreviewFeatures",
-			Input: ManagedMachinePoolScopeParams{
-				Cluster: &clusterv1.Cluster{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-				},
-				ControlPlane: &infrav1.AzureManagedControlPlane{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-					Spec: infrav1.AzureManagedControlPlaneSpec{
-						AzureManagedControlPlaneClassSpec: infrav1.AzureManagedControlPlaneClassSpec{
-							SubscriptionID: "00000000-0000-0000-0000-000000000000",
-						},
-					},
-				},
-				ManagedMachinePool: ManagedMachinePool{
-					MachinePool:      getMachinePool("pool1"),
-					InfraMachinePool: getAzureMachinePool("pool1", infrav1.NodePoolModeUser),
-				},
-			},
-			Expected: false,
+			Name:           "Without EnablePreviewFeatures",
+			previewEnabled: nil,
+			Expected:       false,
 		},
 		{
-			Name: "With EnablePreviewFeatures false",
-			Input: ManagedMachinePoolScopeParams{
-				Cluster: &clusterv1.Cluster{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-				},
-				ControlPlane: &infrav1.AzureManagedControlPlane{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-					Spec: infrav1.AzureManagedControlPlaneSpec{
-						AzureManagedControlPlaneClassSpec: infrav1.AzureManagedControlPlaneClassSpec{
-							SubscriptionID:        "00000000-0000-0000-0000-000000000000",
-							EnablePreviewFeatures: ptr.To(false),
-						},
-					},
-				},
-				ManagedMachinePool: ManagedMachinePool{
-					MachinePool:      getMachinePool("pool1"),
-					InfraMachinePool: getAzureMachinePool("pool1", infrav1.NodePoolModeUser),
-				},
-			},
-			Expected: false,
+			Name:           "With EnablePreviewFeatures false",
+			previewEnabled: ptr.To(false),
+			Expected:       false,
 		},
 		{
-			Name: "With EnablePreviewFeatures true",
-			Input: ManagedMachinePoolScopeParams{
-				Cluster: &clusterv1.Cluster{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-				},
-				ControlPlane: &infrav1.AzureManagedControlPlane{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      "cluster1",
-						Namespace: "default",
-					},
-					Spec: infrav1.AzureManagedControlPlaneSpec{
-						AzureManagedControlPlaneClassSpec: infrav1.AzureManagedControlPlaneClassSpec{
-							SubscriptionID:        "00000000-0000-0000-0000-000000000000",
-							EnablePreviewFeatures: ptr.To(true),
-						},
-					},
-				},
-				ManagedMachinePool: ManagedMachinePool{
-					MachinePool:      getMachinePool("pool1"),
-					InfraMachinePool: getAzureMachinePool("pool1", infrav1.NodePoolModeUser),
-				},
-			},
-			Expected: true,
+			Name:           "With EnablePreviewFeatures true",
+			previewEnabled: ptr.To(true),
+			Expected:       true,
 		},
 	}
 	for _, c := range cases {
 		c := c
 		t.Run(c.Name, func(t *testing.T) {
 			g := NewWithT(t)
-			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(c.Input.MachinePool, c.Input.InfraMachinePool, c.Input.ControlPlane).Build()
-			c.Input.Client = fakeClient
-			s, err := NewManagedMachinePoolScope(context.TODO(), c.Input)
-			g.Expect(err).To(Succeed())
+			s := &ManagedMachinePoolScope{
+				ControlPlane: &infrav1.AzureManagedControlPlane{
+					Spec: infrav1.AzureManagedControlPlaneSpec{
+						AzureManagedControlPlaneClassSpec: infrav1.AzureManagedControlPlaneClassSpec{
+							EnablePreviewFeatures: c.previewEnabled,
+						},
+					},
+				},
+				MachinePool:      &expv1.MachinePool{},
+				InfraMachinePool: &infrav1.AzureManagedMachinePool{},
+			}
 			agentPoolGetter := s.AgentPoolSpec()
 			agentPool, ok := agentPoolGetter.(*agentpools.AgentPoolSpec)
 			g.Expect(ok).To(BeTrue())

azure/services/agentpools/agentpools_test.go

@@ -87,13 +87,13 @@ func TestPostCreateOrUpdateResourceHook(t *testing.T) {
 		scope.EXPECT().SetCAPIMachinePoolReplicas(ptr.To(1234))
 		scope.EXPECT().IsPreviewEnabled().Return(true)
 
-		managedCluster := &asocontainerservicev1preview.ManagedClustersAgentPool{
+		agentPool := &asocontainerservicev1preview.ManagedClustersAgentPool{
 			Status: asocontainerservicev1preview.ManagedClusters_AgentPool_STATUS{
 				EnableAutoScaling: ptr.To(true),
 				Count:             ptr.To(1234),
 			},
 		}
 
-		g.Expect(postCreateOrUpdateResourceHook(context.Background(), scope, managedCluster, nil)).To(Succeed())
+		g.Expect(postCreateOrUpdateResourceHook(context.Background(), scope, agentPool, nil)).To(Succeed())
 	})
 }