kubernetes-sigs · SD-13 · Nov 2, 2023 · Oct 23, 2023 · Oct 24, 2023 · Nov 3, 2023
diff --git a/Makefile b/Makefile
@@ -304,7 +304,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
 	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.5.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
 
 	# Deploy CAAPH
-	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.1.0-alpha.9/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
+	curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.1.0-alpha.10/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -
 
 	# Deploy CAPZ
 	$(KIND) load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=$(KIND_CLUSTER_NAME)

diff --git a/api/v1beta1/azurecluster_default_test.go b/api/v1beta1/azurecluster_default_test.go
@@ -145,7 +145,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -161,7 +161,7 @@ func TestVnetDefaults(t *testing.T) {
 					ResourceGroup: "cluster-test",
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -183,7 +183,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -206,7 +206,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -228,7 +228,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -251,7 +251,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},
@@ -273,7 +273,7 @@ func TestVnetDefaults(t *testing.T) {
 					},
 					AzureClusterClassSpec: AzureClusterClassSpec{
 						IdentityRef: &corev1.ObjectReference{
-							Kind: "AzureClusterIdentity",
+							Kind: AzureClusterIdentityKind,
 						},
 					},
 				},

diff --git a/api/v1beta1/azurecluster_validation.go b/api/v1beta1/azurecluster_validation.go
@@ -79,7 +79,7 @@ func (c *AzureCluster) validateCluster(old *AzureCluster) (admission.Warnings, e
 	}
 
 	return nil, apierrors.NewInvalid(
-		schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: "AzureCluster"},
+		schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: AzureClusterKind},
 		c.Name, allErrs)
 }
 
@@ -147,7 +147,7 @@ func validateIdentityRef(identityRef *corev1.ObjectReference, fldPath *field.Pat
 	if identityRef == nil {
 		return field.Required(fldPath, "identityRef is required")
 	}
-	if identityRef.Kind != "AzureClusterIdentity" {
+	if identityRef.Kind != AzureClusterIdentityKind {
 		return field.NotSupported(fldPath.Child("name"), identityRef.Name, []string{"AzureClusterIdentity"})
 	}
 	return nil

diff --git a/api/v1beta1/azurecluster_validation_test.go b/api/v1beta1/azurecluster_validation_test.go
@@ -1312,7 +1312,7 @@ func createValidCluster() *AzureCluster {
 			NetworkSpec: createValidNetworkSpec(),
 			AzureClusterClassSpec: AzureClusterClassSpec{
 				IdentityRef: &corev1.ObjectReference{
-					Kind: "AzureClusterIdentity",
+					Kind: AzureClusterIdentityKind,
 				},
 			},
 		},

diff --git a/api/v1beta1/azurecluster_webhook.go b/api/v1beta1/azurecluster_webhook.go
@@ -136,7 +136,8 @@ func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings
 		return c.validateCluster(old)
 	}
 
-	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureCluster").GroupKind(), c.Name, allErrs)
+	// replace with constant
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterKind).GroupKind(), c.Name, allErrs)
 }
 
 // validateSubnetUpdate validates a ClusterSpec.NetworkSpec.Subnets for immutability.

diff --git a/api/v1beta1/azureclusteridentity_validation.go b/api/v1beta1/azureclusteridentity_validation.go
@@ -32,5 +32,5 @@ func (c *AzureClusterIdentity) validateClusterIdentity() (admission.Warnings, er
 	if len(allErrs) == 0 {
 		return nil, nil
 	}
-	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterIdentityKind).GroupKind(), c.Name, allErrs)
 }
diff --git a/api/v1beta1/azureclusteridentity_webhook.go b/api/v1beta1/azureclusteridentity_webhook.go
@@ -55,7 +55,7 @@ func (c *AzureClusterIdentity) ValidateUpdate(oldRaw runtime.Object) (admission.
 	if len(allErrs) == 0 {
 		return c.validateClusterIdentity()
 	}
-	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterIdentityKind).GroupKind(), c.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.

diff --git a/api/v1beta1/azuremachine_default_test.go b/api/v1beta1/azuremachine_default_test.go
@@ -567,7 +567,7 @@ func (m mockClient) Get(ctx context.Context, key client.ObjectKey, obj client.Ob
 	case *clusterv1.Cluster:
 		obj.Spec = clusterv1.ClusterSpec{
 			InfrastructureRef: &corev1.ObjectReference{
-				Kind:      "AzureCluster",
+				Kind:      AzureClusterKind,
 				Name:      "test-cluster",
 				Namespace: "default",
 			},

diff --git a/api/v1beta1/azuremachine_webhook_test.go b/api/v1beta1/azuremachine_webhook_test.go
@@ -832,7 +832,7 @@ func (m mockDefaultClient) Get(ctx context.Context, key client.ObjectKey, obj cl
 		obj.Spec.SubscriptionID = m.SubscriptionID
 	case *clusterv1.Cluster:
 		obj.Spec.InfrastructureRef = &corev1.ObjectReference{
-			Kind: "AzureCluster",
+			Kind: AzureClusterKind,
 			Name: "test-cluster",
 		}
 	default:

diff --git a/api/v1beta1/azuremanagedcluster_webhook.go b/api/v1beta1/azuremanagedcluster_webhook.go
@@ -72,7 +72,7 @@ func (r *AzureManagedCluster) ValidateUpdate(oldRaw runtime.Object) (admission.W
 	}
 
 	if len(allErrs) != 0 {
-		return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureManagedCluster").GroupKind(), r.Name, allErrs)
+		return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureManagedClusterKind).GroupKind(), r.Name, allErrs)
 	}
 
 	return nil, nil

diff --git a/api/v1beta1/azuremanagedcontrolplane_webhook.go b/api/v1beta1/azuremanagedcontrolplane_webhook.go
@@ -268,7 +268,7 @@ func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, o
 		return nil, m.Validate(mw.Client)
 	}
 
-	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureManagedControlPlane").GroupKind(), m.Name, allErrs)
+	return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureManagedControlPlaneKind).GroupKind(), m.Name, allErrs)
 }
 
 // ValidateDelete implements webhook.Validator so a webhook will be registered for the type.

diff --git a/api/v1beta1/consts.go b/api/v1beta1/consts.go
@@ -166,3 +166,16 @@ const (
 	// value for the label is the CAPI Cluster Name.
 	OwnedByClusterLabelKey = NameAzureProviderPrefix + string(ResourceLifecycleOwned)
 )
+
+const (
+	// AzureClusterKind indicates the kind of an AzureCluster.
+	AzureClusterKind = "AzureCluster"
+	// AzureMachinePoolKind indicates the kind of an AzureMachinePool.
+	AzureMachinePoolKind = "AzureMachinePool"
+	// AzureManagedClusterKind indicates the kind of an AzureManagedCluster.
+	AzureManagedClusterKind = "AzureManagedCluster"
+	// AzureManagedControlPlaneKind indicates the kind of an AzureManagedControlPlane.
+	AzureManagedControlPlaneKind = "AzureManagedControlPlane"
+	// AzureClusterIdentityKind indicates the kind of an AzureClusterIdentity.
+	AzureClusterIdentityKind = "AzureClusterIdentity"
+)
diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go
@@ -425,7 +425,7 @@ func (s *ClusterScope) GroupSpecs() []azure.ASOResourceSpecGetter[*asoresourcesv
 			Location:       s.Location(),
 			ClusterName:    s.ClusterName(),
 			AdditionalTags: s.AdditionalTags(),
-			Owner:          *metav1.NewControllerRef(s.AzureCluster, infrav1.GroupVersion.WithKind("AzureCluster")),
+			Owner:          *metav1.NewControllerRef(s.AzureCluster, infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind)),
 		},
 	}
 }

diff --git a/azure/scope/machinepool.go b/azure/scope/machinepool.go
@@ -471,7 +471,7 @@ func (m *MachinePoolScope) createMachine(ctx context.Context, machine azure.VMSS
 			OwnerReferences: []metav1.OwnerReference{
 				{
 					APIVersion:         infrav1exp.GroupVersion.String(),
-					Kind:               "AzureMachinePool",
+					Kind:               infrav1.AzureMachinePoolKind,
 					Name:               m.AzureMachinePool.Name,
 					BlockOwnerDeletion: ptr.To(true),
 					UID:                m.AzureMachinePool.UID,

diff --git a/azure/scope/machinepool_test.go b/azure/scope/machinepool_test.go
@@ -1203,7 +1203,7 @@ func getReadyAzureMachinePoolMachines(count int32) []infrav1exp.AzureMachinePool
 				OwnerReferences: []metav1.OwnerReference{
 					{
 						Name:       "amp",
-						Kind:       "AzureMachinePool",
+						Kind:       infrav1.AzureMachinePoolKind,
 						APIVersion: infrav1exp.GroupVersion.String(),
 					},
 				},

diff --git a/azure/scope/managedcontrolplane.go b/azure/scope/managedcontrolplane.go
@@ -256,7 +256,7 @@ func (s *ManagedControlPlaneScope) GroupSpecs() []azure.ASOResourceSpecGetter[*a
 			Location:       s.Location(),
 			ClusterName:    s.ClusterName(),
 			AdditionalTags: s.AdditionalTags(),
-			Owner:          *metav1.NewControllerRef(s.ControlPlane, infrav1.GroupVersion.WithKind("AzureManagedControlPlane")),
+			Owner:          *metav1.NewControllerRef(s.ControlPlane, infrav1.GroupVersion.WithKind(infrav1.AzureManagedControlPlaneKind)),
 		},
 	}
 }
@@ -655,7 +655,7 @@ func (s *ManagedControlPlaneScope) MakeEmptyKubeConfigSecret() corev1.Secret {
 			Name:      secret.Name(s.Cluster.Name, secret.Kubeconfig),
 			Namespace: s.Cluster.Namespace,
 			OwnerReferences: []metav1.OwnerReference{
-				*metav1.NewControllerRef(s.ControlPlane, infrav1.GroupVersion.WithKind("AzureManagedControlPlane")),
+				*metav1.NewControllerRef(s.ControlPlane, infrav1.GroupVersion.WithKind(infrav1.AzureManagedControlPlaneKind)),
 			},
 			Labels: map[string]string{clusterv1.ClusterNameLabel: s.Cluster.Name},
 		},

diff --git a/controllers/asosecret_controller.go b/controllers/asosecret_controller.go
@@ -94,7 +94,7 @@ func (asos *ASOSecretReconciler) SetupWithManager(ctx context.Context, mgr ctrl.
 	// Add a watch on clusterv1.Cluster object for unpause notifications.
 	if err = c.Watch(
 		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
-		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("AzureCluster"), mgr.GetClient(), &infrav1.AzureCluster{})),
+		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind), mgr.GetClient(), &infrav1.AzureCluster{})),
 		predicates.ClusterUnpaused(log),
 		predicates.ResourceNotPausedAndHasFilterLabel(log, asos.WatchFilterValue),
 	); err != nil {
@@ -112,7 +112,7 @@ func (asos *ASOSecretReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	ctx, log, done := tele.StartSpanWithLogger(ctx, "controllers.ASOSecret.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureCluster"),
+		tele.KVP("kind", infrav1.AzureClusterKind),
 	)
 	defer done()
 

diff --git a/controllers/azurecluster_controller.go b/controllers/azurecluster_controller.go
@@ -95,7 +95,7 @@ func (acr *AzureClusterReconciler) SetupWithManager(ctx context.Context, mgr ctr
 	// Add a watch on clusterv1.Cluster object for pause/unpause notifications.
 	if err = c.Watch(
 		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
-		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("AzureCluster"), mgr.GetClient(), &infrav1.AzureCluster{})),
+		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind), mgr.GetClient(), &infrav1.AzureCluster{})),
 		ClusterUpdatePauseChange(log),
 		predicates.ResourceHasFilterLabel(log, acr.WatchFilterValue),
 	); err != nil {
@@ -126,7 +126,7 @@ func (acr *AzureClusterReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 		"controllers.AzureClusterReconciler.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureCluster"),
+		tele.KVP("kind", infrav1.AzureClusterKind),
 	)
 	defer done()
 

diff --git a/controllers/azureidentity_controller.go b/controllers/azureidentity_controller.go
@@ -84,7 +84,7 @@ func (r *AzureIdentityReconciler) SetupWithManager(ctx context.Context, mgr ctrl
 	// Add a watch on clusterv1.Cluster object for unpause notifications.
 	if err = c.Watch(
 		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
-		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("AzureCluster"), mgr.GetClient(), &infrav1.AzureCluster{})),
+		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind), mgr.GetClient(), &infrav1.AzureCluster{})),
 		predicates.ClusterUnpaused(log),
 		predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue),
 	); err != nil {
@@ -107,7 +107,7 @@ func (r *AzureIdentityReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	ctx, log, done := tele.StartSpanWithLogger(ctx, "controllers.AzureIdentityReconciler.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureCluster"),
+		tele.KVP("kind", infrav1.AzureClusterKind),
 	)
 	defer done()
 

diff --git a/controllers/azurejson_machine_controller.go b/controllers/azurejson_machine_controller.go
@@ -169,7 +169,7 @@ func (r *AzureJSONMachineReconciler) Reconcile(ctx context.Context, req ctrl.Req
 		return ctrl.Result{}, nil
 	}
 
-	_, kind := infrav1.GroupVersion.WithKind("AzureCluster").ToAPIVersionAndKind()
+	_, kind := infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind).ToAPIVersionAndKind()
 
 	// only look at azure clusters
 	if cluster.Spec.InfrastructureRef == nil {

diff --git a/controllers/azurejson_machine_controller_test.go b/controllers/azurejson_machine_controller_test.go
@@ -99,7 +99,7 @@ func TestAzureJSONMachineReconciler(t *testing.T) {
 		Spec: clusterv1.ClusterSpec{
 			InfrastructureRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureCluster",
+				Kind:       infrav1.AzureClusterKind,
 				Name:       "my-azure-cluster",
 			},
 		},

diff --git a/controllers/azurejson_machinepool_controller.go b/controllers/azurejson_machinepool_controller.go
@@ -100,7 +100,7 @@ func (r *AzureJSONMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl
 		"controllers.AzureJSONMachinePoolReconciler.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureMachinePool"),
+		tele.KVP("kind", infrav1.AzureMachinePoolKind),
 	)
 	defer done()
 
@@ -138,7 +138,7 @@ func (r *AzureJSONMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl
 
 	log = log.WithValues("cluster", cluster.Name)
 
-	_, kind := infrav1.GroupVersion.WithKind("AzureCluster").ToAPIVersionAndKind()
+	_, kind := infrav1.GroupVersion.WithKind(infrav1.AzureClusterKind).ToAPIVersionAndKind()
 
 	// only look at azure clusters
 	if cluster.Spec.InfrastructureRef == nil {
@@ -186,7 +186,7 @@ func (r *AzureJSONMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl
 		}
 	}
 
-	apiVersion, kind := infrav1.GroupVersion.WithKind("AzureMachinePool").ToAPIVersionAndKind()
+	apiVersion, kind := infrav1.GroupVersion.WithKind(infrav1.AzureMachinePoolKind).ToAPIVersionAndKind()
 	owner := metav1.OwnerReference{
 		APIVersion: apiVersion,
 		Kind:       kind,

diff --git a/controllers/azurejson_machinepool_controller_test.go b/controllers/azurejson_machinepool_controller_test.go
@@ -49,7 +49,7 @@ func TestAzureJSONPoolReconciler(t *testing.T) {
 		Spec: clusterv1.ClusterSpec{
 			InfrastructureRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureCluster",
+				Kind:       infrav1.AzureClusterKind,
 				Name:       "my-azure-cluster",
 			},
 		},

diff --git a/controllers/azurejson_machinetemplate_controller.go b/controllers/azurejson_machinetemplate_controller.go
@@ -136,7 +136,7 @@ func (r *AzureJSONTemplateReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		log.Info("infra ref is nil")
 		return ctrl.Result{}, nil
 	}
-	if cluster.Spec.InfrastructureRef.Kind != "AzureCluster" {
+	if cluster.Spec.InfrastructureRef.Kind != infrav1.AzureClusterKind {
 		log.WithValues("kind", cluster.Spec.InfrastructureRef.Kind).Info("infra ref was not an AzureCluster")
 		return ctrl.Result{}, nil
 	}

diff --git a/controllers/azurejson_machinetemplate_controller_test.go b/controllers/azurejson_machinetemplate_controller_test.go
@@ -47,7 +47,7 @@ func TestAzureJSONTemplateReconciler(t *testing.T) {
 		Spec: clusterv1.ClusterSpec{
 			InfrastructureRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureCluster",
+				Kind:       infrav1.AzureClusterKind,
 				Name:       "my-azure-cluster",
 			},
 		},

diff --git a/controllers/azuremachine_controller_test.go b/controllers/azuremachine_controller_test.go
@@ -517,7 +517,7 @@ func getFakeCluster(changes ...func(*clusterv1.Cluster)) *clusterv1.Cluster {
 		Spec: clusterv1.ClusterSpec{
 			InfrastructureRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureCluster",
+				Kind:       infrav1.AzureClusterKind,
 				Name:       "my-azure-cluster",
 			},
 		},

diff --git a/controllers/azuremanagedcluster_controller.go b/controllers/azuremanagedcluster_controller.go
@@ -85,7 +85,7 @@ func (amcr *AzureManagedClusterReconciler) SetupWithManager(ctx context.Context,
 	// Add a watch on clusterv1.Cluster object for unpause notifications.
 	if err = c.Watch(
 		source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
-		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind("AzureManagedCluster"), mgr.GetClient(), &infrav1.AzureManagedCluster{})),
+		handler.EnqueueRequestsFromMapFunc(util.ClusterToInfrastructureMapFunc(ctx, infrav1.GroupVersion.WithKind(infrav1.AzureManagedClusterKind), mgr.GetClient(), &infrav1.AzureManagedCluster{})),
 		predicates.ClusterUnpaused(log),
 		predicates.ResourceNotPausedAndHasFilterLabel(log, amcr.WatchFilterValue),
 	); err != nil {
@@ -109,7 +109,7 @@ func (amcr *AzureManagedClusterReconciler) Reconcile(ctx context.Context, req ct
 		"controllers.AzureManagedClusterReconciler.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureManagedCluster"),
+		tele.KVP("kind", infrav1.AzureManagedClusterKind),
 	)
 	defer done()