move defaulting of amcp sku into defaulting webhook

azure/scope/managedcontrolplane.go

@@ -424,7 +424,7 @@ func (s *ManagedControlPlaneScope) ManagedClusterSpec() (azure.ManagedClusterSpe
 
 	if s.ControlPlane.Spec.SKU != nil {
 		managedClusterSpec.SKU = &azure.SKU{
-			Tier: s.ControlPlane.Spec.SKU.Tier,
+			Tier: string(s.ControlPlane.Spec.SKU.Tier),
 		}
 	}
 

azure/services/managedclusters/managedclusters.go

@@ -259,12 +259,6 @@ func (s *Service) Reconcile(ctx context.Context) error {
 			Name: containerservice.ManagedClusterSKUNameBasic,
 			Tier: tierName,
 		}
-	} else {
-		// Add the default sku so that the diff will match if no sku is specified by the spec.
-		managedCluster.Sku = &containerservice.ManagedClusterSKU{
-			Name: containerservice.ManagedClusterSKUNameBasic,
-			Tier: containerservice.ManagedClusterSKUTierFree,
-		}
 	}
 
 	if managedClusterSpec.LoadBalancerProfile != nil {

exp/api/v1beta1/azuremanagedcontrolplane_default.go

@@ -73,3 +73,11 @@ func (r *AzureManagedControlPlane) setDefaultSubnet() {
 		r.Spec.VirtualNetwork.Subnet.CIDRBlock = defaultAKSNodeSubnetCIDR
 	}
 }
+
+func (r *AzureManagedControlPlane) setDefaultSku() {
+	if r.Spec.SKU == nil {
+		r.Spec.SKU = &SKU{
+			Tier: FreeManagedControlPlaneTier,
+		}
+	}
+}

exp/api/v1beta1/azuremanagedcontrolplane_types.go

@@ -122,11 +122,21 @@ type AADProfile struct {
 	AdminGroupObjectIDs []string `json:"adminGroupObjectIDs"`
 }
 
+// AzureManagedControlPlaneSkuTier - Tier of a managed cluster SKU.
+// +kubebuilder:validation:Enum=Free;Paid
+type AzureManagedControlPlaneSkuTier string
+
+const (
+	// FreeManagedControlPlaneTier is the free tier of AKS without corresponding SLAs.
+	FreeManagedControlPlaneTier AzureManagedControlPlaneSkuTier = "Free"
+	// PaidManagedControlPlaneTier is the paid tier of AKS with corresponding SLAs.
+	PaidManagedControlPlaneTier AzureManagedControlPlaneSkuTier = "Paid"
+)
+
 // SKU - AKS SKU.
 type SKU struct {
 	// Tier - Tier of a managed cluster SKU.
-	// +kubebuilder:validation:Enum=Free;Paid
-	Tier string `json:"tier"`
+	Tier AzureManagedControlPlaneSkuTier `json:"tier"`
 }
 
 // LoadBalancerProfile - Profile of the cluster load balancer.

exp/api/v1beta1/azuremanagedcontrolplane_webhook.go

@@ -80,6 +80,7 @@ func (r *AzureManagedControlPlane) Default() {
 	r.setDefaultNodeResourceGroupName()
 	r.setDefaultVirtualNetwork()
 	r.setDefaultSubnet()
+	r.setDefaultSku()
 }
 
 // +kubebuilder:webhook:verbs=create;update,path=/validate-infrastructure-cluster-x-k8s-io-v1beta1-azuremanagedcontrolplane,mutating=false,failurePolicy=fail,groups=infrastructure.cluster.x-k8s.io,resources=azuremanagedcontrolplanes,versions=v1beta1,name=validation.azuremanagedcontrolplanes.infrastructure.cluster.x-k8s.io,sideEffects=None,admissionReviewVersions=v1;v1beta1

exp/api/v1beta1/azuremanagedcontrolplane_webhook_test.go

@@ -49,6 +49,7 @@ func TestDefaultingWebhook(t *testing.T) {
 	g.Expect(amcp.Spec.NodeResourceGroupName).To(Equal("MC_fooRg_fooName_fooLocation"))
 	g.Expect(amcp.Spec.VirtualNetwork.Name).To(Equal("fooName"))
 	g.Expect(amcp.Spec.VirtualNetwork.Subnet.Name).To(Equal("fooName"))
+	g.Expect(amcp.Spec.SKU.Tier).To(Equal(FreeManagedControlPlaneTier))
 
 	t.Logf("Testing amcp defaulting webhook with baseline")
 	netPlug := "kubenet"
@@ -62,6 +63,7 @@ func TestDefaultingWebhook(t *testing.T) {
 	amcp.Spec.NodeResourceGroupName = "fooNodeRg"
 	amcp.Spec.VirtualNetwork.Name = "fooVnetName"
 	amcp.Spec.VirtualNetwork.Subnet.Name = "fooSubnetName"
+	amcp.Spec.SKU.Tier = PaidManagedControlPlaneTier
 	amcp.Default()
 	g.Expect(*amcp.Spec.NetworkPlugin).To(Equal(netPlug))
 	g.Expect(*amcp.Spec.LoadBalancerSKU).To(Equal(lbSKU))
@@ -71,6 +73,7 @@ func TestDefaultingWebhook(t *testing.T) {
 	g.Expect(amcp.Spec.NodeResourceGroupName).To(Equal("fooNodeRg"))
 	g.Expect(amcp.Spec.VirtualNetwork.Name).To(Equal("fooVnetName"))
 	g.Expect(amcp.Spec.VirtualNetwork.Subnet.Name).To(Equal("fooSubnetName"))
+	g.Expect(amcp.Spec.SKU.Tier).To(Equal(PaidManagedControlPlaneTier))
 }
 
 func TestValidatingWebhook(t *testing.T) {

exp/controllers/azuremanagedmachinepool_controller.go

@@ -18,6 +18,7 @@ package controllers
 
 import (
 	"context"
+	"fmt"
 	"time"
 
 	"github.com/go-logr/logr"
@@ -227,7 +228,7 @@ func (ammpr *AzureManagedMachinePoolReconciler) Reconcile(ctx context.Context, r
 }
 
 func (ammpr *AzureManagedMachinePoolReconciler) reconcileNormal(ctx context.Context, scope *scope.ManagedControlPlaneScope) (reconcile.Result, error) {
-	ctx, _, done := tele.StartSpanWithLogger(ctx, "controllers.AzureManagedMachinePoolReconciler.reconcileNormal")
+	ctx, log, done := tele.StartSpanWithLogger(ctx, "controllers.AzureManagedMachinePoolReconciler.reconcileNormal")
 	defer done()
 
 	scope.Logger.Info("Reconciling AzureManagedMachinePool")
@@ -241,6 +242,7 @@ func (ammpr *AzureManagedMachinePoolReconciler) reconcileNormal(ctx context.Cont
 
 	if err := ammpr.createAzureManagedMachinePoolService(scope).Reconcile(ctx); err != nil {
 		if IsAgentPoolVMSSNotFoundError(err) {
+			log.V(2).Info(fmt.Sprintf("unable to find agent pool %s/%s", scope.InfraMachinePool.Namespace, scope.InfraMachinePool.Name))
 			// if the underlying VMSS is not yet created, requeue for 30s in the future
 			return reconcile.Result{
 				RequeueAfter: 30 * time.Second,

exp/controllers/helpers.go

@@ -414,7 +414,7 @@ func MachinePoolToAzureManagedControlPlaneMapFunc(ctx context.Context, c client.
 		ammp := &infrav1exp.AzureManagedMachinePool{}
 		key := types.NamespacedName{Namespace: infraMachinePoolRef.Namespace, Name: infraMachinePoolRef.Name}
 		if err := c.Get(ctx, key, ammp); err != nil {
-			log.Error(err, "failed to fetch azure managed machine pool for Machinepool: %s", infraMachinePoolRef.Name)
+			log.Error(err, fmt.Sprintf("failed to fetch azure managed machine pool for Machinepool: %s", infraMachinePoolRef.Name))
 			// If we get here, we might want to reconcile but aren't sure.
 			// Do it anyway to be safe. Worst case we reconcile a few extra times with no-ops.
 			return []reconcile.Request{