Merge pull request #4254 from SD-13/kind_name_constants

k8s-ci-robot · web-flow · commit 4475fa7d9c3f · 2023-11-16T19:58:45.000+01:00
Add constants for kind names
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,7 @@ func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings
 		return c.validateCluster(old)
 	}
 
-	return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureCluster").GroupKind(), c.Name, allErrs)
+	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/azuremanagedcontrolplane_webhook.go b/api/v1beta1/azuremanagedcontrolplane_webhook.go
@@ -264,7 +264,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
@@ -158,3 +158,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
@@ -430,7 +430,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
@@ -489,7 +489,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
@@ -1211,7 +1211,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
@@ -272,7 +272,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)),
 		},
 	}
 }
@@ -667,7 +667,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
@@ -98,7 +98,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()
 
@@ -160,7 +160,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
@@ -516,7 +516,7 @@ func getFakeCluster() *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()
 
diff --git a/controllers/azuremanagedcontrolplane_controller.go b/controllers/azuremanagedcontrolplane_controller.go
@@ -74,7 +74,7 @@ func (amcpr *AzureManagedControlPlaneReconciler) SetupWithManager(ctx context.Co
 	}
 
 	// map requests for machine pools corresponding to AzureManagedControlPlane's defaultPool back to the corresponding AzureManagedControlPlane.
-	azureManagedMachinePoolMapper := MachinePoolToAzureManagedControlPlaneMapFunc(ctx, amcpr.Client, infrav1.GroupVersion.WithKind("AzureManagedControlPlane"), log)
+	azureManagedMachinePoolMapper := MachinePoolToAzureManagedControlPlaneMapFunc(ctx, amcpr.Client, infrav1.GroupVersion.WithKind(infrav1.AzureManagedControlPlaneKind), log)
 
 	c, err := ctrl.NewControllerManagedBy(mgr).
 		WithOptions(options.Options).
@@ -124,7 +124,7 @@ func (amcpr *AzureManagedControlPlaneReconciler) Reconcile(ctx context.Context,
 	ctx, log, done := tele.StartSpanWithLogger(ctx, "controllers.AzureManagedControlPlaneReconciler.Reconcile",
 		tele.KVP("namespace", req.Namespace),
 		tele.KVP("name", req.Name),
-		tele.KVP("kind", "AzureManagedControlPlane"),
+		tele.KVP("kind", infrav1.AzureManagedControlPlaneKind),
 	)
 	defer done()
 
@@ -335,7 +335,7 @@ func (amcpr *AzureManagedControlPlaneReconciler) ClusterToAzureManagedControlPla
 	}
 
 	controlPlaneRef := c.Spec.ControlPlaneRef
-	if controlPlaneRef != nil && controlPlaneRef.Kind == "AzureManagedControlPlane" {
+	if controlPlaneRef != nil && controlPlaneRef.Kind == infrav1.AzureManagedControlPlaneKind {
 		return []ctrl.Request{{NamespacedName: client.ObjectKey{Namespace: controlPlaneRef.Namespace, Name: controlPlaneRef.Name}}}
 	}
 
diff --git a/controllers/azuremanagedcontrolplane_controller_test.go b/controllers/azuremanagedcontrolplane_controller_test.go
@@ -58,7 +58,7 @@ func TestClusterToAzureManagedControlPlane(t *testing.T) {
 		{
 			name: "ok",
 			controlPlaneRef: &corev1.ObjectReference{
-				Kind:      "AzureManagedControlPlane",
+				Kind:      infrav1.AzureManagedControlPlaneKind,
 				Name:      "name",
 				Namespace: "namespace",
 			},
diff --git a/controllers/azuremanagedmachinepool_controller_test.go b/controllers/azuremanagedmachinepool_controller_test.go
@@ -241,13 +241,13 @@ func newReadyAzureManagedMachinePoolCluster() (*clusterv1.Cluster, *infrav1.Azur
 		Spec: clusterv1.ClusterSpec{
 			ControlPlaneRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureManagedControlPlane",
+				Kind:       infrav1.AzureManagedControlPlaneKind,
 				Name:       azManagedControlPlane.Name,
 				Namespace:  azManagedControlPlane.Namespace,
 			},
 			InfrastructureRef: &corev1.ObjectReference{
 				APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
-				Kind:       "AzureManagedCluster",
+				Kind:       infrav1.AzureManagedClusterKind,
 				Name:       azManagedCluster.Name,
 				Namespace:  azManagedCluster.Namespace,
 			},
diff --git a/controllers/helpers.go b/controllers/helpers.go
diff --git a/controllers/helpers_test.go b/controllers/helpers_test.go
diff --git a/exp/api/v1beta1/azuremachinepool_webhook_test.go b/exp/api/v1beta1/azuremachinepool_webhook_test.go
diff --git a/exp/controllers/azuremachinepool_controller.go b/exp/controllers/azuremachinepool_controller.go
diff --git a/exp/controllers/azuremachinepool_controller_unit_test.go b/exp/controllers/azuremachinepool_controller_unit_test.go
diff --git a/exp/controllers/azuremachinepoolmachine_controller_test.go b/exp/controllers/azuremachinepoolmachine_controller_test.go
diff --git a/exp/controllers/helpers_test.go b/exp/controllers/helpers_test.go
diff --git a/util/tele/span_logger.go b/util/tele/span_logger.go

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ func (c AzureCluster) validateCluster(old AzureCluster) (admission.Warnings, e`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`return nil, apierrors.NewInvalid(`
`82`		`- schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: "AzureCluster"},`
	`82`	`+ schema.GroupKind{Group: "infrastructure.cluster.x-k8s.io", Kind: AzureClusterKind},`
`83`	`83`	`c.Name, allErrs)`
`84`	`84`	`}`
`85`	`85`
`@@ -147,7 +147,7 @@ func validateIdentityRef(identityRef corev1.ObjectReference, fldPath field.Pat`
`147`	`147`	`if identityRef == nil {`
`148`	`148`	`return field.Required(fldPath, "identityRef is required")`
`149`	`149`	`}`
`150`		`- if identityRef.Kind != "AzureClusterIdentity" {`
	`150`	`+ if identityRef.Kind != AzureClusterIdentityKind {`
`151`	`151`	`return field.NotSupported(fldPath.Child("name"), identityRef.Name, []string{"AzureClusterIdentity"})`
`152`	`152`	`}`
`153`	`153`	`return nil`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ func (c *AzureCluster) ValidateUpdate(oldRaw runtime.Object) (admission.Warnings`
`136`	`136`	`return c.validateCluster(old)`
`137`	`137`	`}`
`138`	`138`
`139`		`- return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureCluster").GroupKind(), c.Name, allErrs)`
	`139`	`+ return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterKind).GroupKind(), c.Name, allErrs)`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// validateSubnetUpdate validates a ClusterSpec.NetworkSpec.Subnets for immutability.`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ func (c *AzureClusterIdentity) validateClusterIdentity() (admission.Warnings, er`
`32`	`32`	`if len(allErrs) == 0 {`
`33`	`33`	`return nil, nil`
`34`	`34`	`}`
`35`		`- return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)`
	`35`	`+ return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterIdentityKind).GroupKind(), c.Name, allErrs)`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ func (c *AzureClusterIdentity) ValidateUpdate(oldRaw runtime.Object) (admission.`
`55`	`55`	`if len(allErrs) == 0 {`
`56`	`56`	`return c.validateClusterIdentity()`
`57`	`57`	`}`
`58`		`- return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureClusterIdentity").GroupKind(), c.Name, allErrs)`
	`58`	`+ return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureClusterIdentityKind).GroupKind(), c.Name, allErrs)`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.`
Original file line number	Diff line number	Diff line change
`@@ -832,7 +832,7 @@ func (m mockDefaultClient) Get(ctx context.Context, key client.ObjectKey, obj cl`
`832`	`832`	`obj.Spec.SubscriptionID = m.SubscriptionID`
`833`	`833`	`case *clusterv1.Cluster:`
`834`	`834`	`obj.Spec.InfrastructureRef = &corev1.ObjectReference{`
`835`		`- Kind: "AzureCluster",`
	`835`	`+ Kind: AzureClusterKind,`
`836`	`836`	`Name: "test-cluster",`
`837`	`837`	`}`
`838`	`838`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -264,7 +264,7 @@ func (mw *azureManagedControlPlaneWebhook) ValidateUpdate(ctx context.Context, o`
`264`	`264`	`return nil, m.Validate(mw.Client)`
`265`	`265`	`}`
`266`	`266`
`267`		`- return nil, apierrors.NewInvalid(GroupVersion.WithKind("AzureManagedControlPlane").GroupKind(), m.Name, allErrs)`
	`267`	`+ return nil, apierrors.NewInvalid(GroupVersion.WithKind(AzureManagedControlPlaneKind).GroupKind(), m.Name, allErrs)`
`268`	`268`	`}`
`269`	`269`
`270`	`270`	`// ValidateDelete implements webhook.Validator so a webhook will be registered for the type.`