Merge pull request #5662 from nojnhuh/asoapi-version-match

k8s-ci-robot · web-flow · commit ee37fc721e95 · 2025-06-02T23:12:42.000-07:00
Match AzureASOManaged references on group and kind, not version
diff --git a/controllers/agentpooladopt_controller.go b/controllers/agentpooladopt_controller.go
@@ -84,7 +84,7 @@ func (r *AgentPoolAdoptReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 
 	for _, owner := range agentPool.GetOwnerReferences() {
-		if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&
+		if matchesASOManagedAPIGroup(owner.APIVersion) &&
 			owner.Kind == infrav1alpha.AzureASOManagedMachinePoolKind {
 			return ctrl.Result{}, nil
 		}
@@ -126,7 +126,7 @@ func (r *AgentPoolAdoptReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 	var managedControlPlaneOwner *metav1.OwnerReference
 	for _, owner := range managedCluster.GetOwnerReferences() {
-		if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&
+		if matchesASOManagedAPIGroup(owner.APIVersion) &&
 			owner.Kind == infrav1alpha.AzureASOManagedControlPlaneKind &&
 			owner.Name == agentPool.Owner().Name {
 			managedControlPlaneOwner = ptr.To(owner)
diff --git a/controllers/azureasomanagedcluster_controller.go b/controllers/azureasomanagedcluster_controller.go
@@ -23,6 +23,7 @@ import (
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/external"
 	"sigs.k8s.io/cluster-api/util"
@@ -145,7 +146,7 @@ func asoManagedControlPlaneToManagedClusterMap(c client.Client) handler.MapFunc
 
 		if cluster == nil ||
 			cluster.Spec.InfrastructureRef == nil ||
-			cluster.Spec.InfrastructureRef.APIVersion != infrav1alpha.GroupVersion.Identifier() ||
+			!matchesASOManagedAPIGroup(cluster.Spec.InfrastructureRef.APIVersion) ||
 			cluster.Spec.InfrastructureRef.Kind != infrav1alpha.AzureASOManagedClusterKind {
 			return nil
 		}
@@ -161,6 +162,11 @@ func asoManagedControlPlaneToManagedClusterMap(c client.Client) handler.MapFunc
 	}
 }
 
+func matchesASOManagedAPIGroup(apiVersion string) bool {
+	gv, _ := schema.ParseGroupVersion(apiVersion)
+	return gv.Group == infrav1alpha.GroupVersion.Group
+}
+
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=azureasomanagedclusters/finalizers,verbs=update
@@ -224,7 +230,7 @@ func (r *AzureASOManagedClusterReconciler) reconcileNormal(ctx context.Context,
 		return ctrl.Result{}, nil
 	}
 	if cluster.Spec.ControlPlaneRef == nil ||
-		cluster.Spec.ControlPlaneRef.APIVersion != infrav1alpha.GroupVersion.Identifier() ||
+		!matchesASOManagedAPIGroup(cluster.Spec.ControlPlaneRef.APIVersion) ||
 		cluster.Spec.ControlPlaneRef.Kind != infrav1alpha.AzureASOManagedControlPlaneKind {
 		return ctrl.Result{}, reconcile.TerminalError(errInvalidControlPlaneKind)
 	}
diff --git a/controllers/azureasomanagedcluster_controller_test.go b/controllers/azureasomanagedcluster_controller_test.go
@@ -130,7 +130,7 @@ func TestAzureASOManagedClusterReconcile(t *testing.T) {
 			},
 			Spec: clusterv1.ClusterSpec{
 				ControlPlaneRef: &corev1.ObjectReference{
-					APIVersion: infrav1alpha.GroupVersion.Identifier(),
+					APIVersion: "infrastructure.cluster.x-k8s.io/v1somethingelse",
 					Kind:       infrav1alpha.AzureASOManagedControlPlaneKind,
 				},
 			},
diff --git a/controllers/azureasomanagedcontrolplane_controller.go b/controllers/azureasomanagedcontrolplane_controller.go
@@ -114,7 +114,7 @@ func (r *AzureASOManagedControlPlaneReconciler) SetupWithManager(ctx context.Con
 func clusterToAzureASOManagedControlPlane(_ context.Context, o client.Object) []ctrl.Request {
 	controlPlaneRef := o.(*clusterv1.Cluster).Spec.ControlPlaneRef
 	if controlPlaneRef != nil &&
-		controlPlaneRef.APIVersion == infrav1alpha.GroupVersion.Identifier() &&
+		matchesASOManagedAPIGroup(controlPlaneRef.APIVersion) &&
 		controlPlaneRef.Kind == infrav1alpha.AzureASOManagedControlPlaneKind {
 		return []ctrl.Request{{NamespacedName: client.ObjectKey{Namespace: controlPlaneRef.Namespace, Name: controlPlaneRef.Name}}}
 	}
@@ -198,7 +198,7 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileNormal(ctx context.Cont
 		return ctrl.Result{}, nil
 	}
 	if cluster.Spec.InfrastructureRef == nil ||
-		cluster.Spec.InfrastructureRef.APIVersion != infrav1alpha.GroupVersion.Identifier() ||
+		!matchesASOManagedAPIGroup(cluster.Spec.InfrastructureRef.APIVersion) ||
 		cluster.Spec.InfrastructureRef.Kind != infrav1alpha.AzureASOManagedClusterKind {
 		return ctrl.Result{}, reconcile.TerminalError(errInvalidClusterKind)
 	}
diff --git a/controllers/azureasomanagedcontrolplane_controller_test.go b/controllers/azureasomanagedcontrolplane_controller_test.go
@@ -112,7 +112,7 @@ func TestAzureASOManagedControlPlaneReconcile(t *testing.T) {
 			},
 			Spec: clusterv1.ClusterSpec{
 				InfrastructureRef: &corev1.ObjectReference{
-					APIVersion: infrav1alpha.GroupVersion.Identifier(),
+					APIVersion: "infrastructure.cluster.x-k8s.io/v1somethingelse",
 					Kind:       infrav1alpha.AzureASOManagedClusterKind,
 				},
 			},
diff --git a/controllers/azureasomanagedmachinepool_controller.go b/controllers/azureasomanagedmachinepool_controller.go
@@ -185,7 +185,7 @@ func (r *AzureASOManagedMachinePoolReconciler) Reconcile(ctx context.Context, re
 		return ctrl.Result{}, nil
 	}
 	if cluster.Spec.ControlPlaneRef == nil ||
-		cluster.Spec.ControlPlaneRef.APIVersion != infrav1alpha.GroupVersion.Identifier() ||
+		!matchesASOManagedAPIGroup(cluster.Spec.ControlPlaneRef.APIVersion) ||
 		cluster.Spec.ControlPlaneRef.Kind != infrav1alpha.AzureASOManagedControlPlaneKind {
 		return ctrl.Result{}, reconcile.TerminalError(fmt.Errorf("AzureASOManagedMachinePool cannot be used without AzureASOManagedControlPlane"))
 	}
diff --git a/controllers/azureasomanagedmachinepool_controller_test.go b/controllers/azureasomanagedmachinepool_controller_test.go
@@ -157,7 +157,7 @@ func TestAzureASOManagedMachinePoolReconcile(t *testing.T) {
 			},
 			Spec: clusterv1.ClusterSpec{
 				ControlPlaneRef: &corev1.ObjectReference{
-					APIVersion: infrav1alpha.GroupVersion.Identifier(),
+					APIVersion: "infrastructure.cluster.x-k8s.io/v1somethingelse",
 					Kind:       infrav1alpha.AzureASOManagedControlPlaneKind,
 				},
 			},
diff --git a/controllers/managedclusteradopt_controller.go b/controllers/managedclusteradopt_controller.go
@@ -88,7 +88,7 @@ func (r *ManagedClusterAdoptReconciler) Reconcile(ctx context.Context, req ctrl.
 	}
 
 	for _, owner := range managedCluster.GetOwnerReferences() {
-		if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&
+		if matchesASOManagedAPIGroup(owner.APIVersion) &&
 			owner.Kind == infrav1alpha.AzureASOManagedControlPlaneKind {
 			return ctrl.Result{}, nil
 		}

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func (r *AgentPoolAdoptReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`for _, owner := range agentPool.GetOwnerReferences() {`
`87`		`- if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&`
	`87`	`+ if matchesASOManagedAPIGroup(owner.APIVersion) &&`
`88`	`88`	`owner.Kind == infrav1alpha.AzureASOManagedMachinePoolKind {`
`89`	`89`	`return ctrl.Result{}, nil`
`90`	`90`	`}`
`@@ -126,7 +126,7 @@ func (r *AgentPoolAdoptReconciler) Reconcile(ctx context.Context, req ctrl.Reque`
`126`	`126`	`}`
`127`	`127`	`var managedControlPlaneOwner *metav1.OwnerReference`
`128`	`128`	`for _, owner := range managedCluster.GetOwnerReferences() {`
`129`		`- if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&`
	`129`	`+ if matchesASOManagedAPIGroup(owner.APIVersion) &&`
`130`	`130`	`owner.Kind == infrav1alpha.AzureASOManagedControlPlaneKind &&`
`131`	`131`	`owner.Name == agentPool.Owner().Name {`
`132`	`132`	`managedControlPlaneOwner = ptr.To(owner)`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ func (r *AzureASOManagedControlPlaneReconciler) SetupWithManager(ctx context.Con`
`114`	`114`	`func clusterToAzureASOManagedControlPlane(_ context.Context, o client.Object) []ctrl.Request {`
`115`	`115`	`controlPlaneRef := o.(*clusterv1.Cluster).Spec.ControlPlaneRef`
`116`	`116`	`if controlPlaneRef != nil &&`
`117`		`- controlPlaneRef.APIVersion == infrav1alpha.GroupVersion.Identifier() &&`
	`117`	`+ matchesASOManagedAPIGroup(controlPlaneRef.APIVersion) &&`
`118`	`118`	`controlPlaneRef.Kind == infrav1alpha.AzureASOManagedControlPlaneKind {`
`119`	`119`	`return []ctrl.Request{{NamespacedName: client.ObjectKey{Namespace: controlPlaneRef.Namespace, Name: controlPlaneRef.Name}}}`
`120`	`120`	`}`
`@@ -198,7 +198,7 @@ func (r *AzureASOManagedControlPlaneReconciler) reconcileNormal(ctx context.Cont`
`198`	`198`	`return ctrl.Result{}, nil`
`199`	`199`	`}`
`200`	`200`	`if cluster.Spec.InfrastructureRef == nil \|\|`
`201`		`- cluster.Spec.InfrastructureRef.APIVersion != infrav1alpha.GroupVersion.Identifier() \|\|`
	`201`	`+ !matchesASOManagedAPIGroup(cluster.Spec.InfrastructureRef.APIVersion) \|\|`
`202`	`202`	`cluster.Spec.InfrastructureRef.Kind != infrav1alpha.AzureASOManagedClusterKind {`
`203`	`203`	`return ctrl.Result{}, reconcile.TerminalError(errInvalidClusterKind)`
`204`	`204`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ func (r *AzureASOManagedMachinePoolReconciler) Reconcile(ctx context.Context, re`
`185`	`185`	`return ctrl.Result{}, nil`
`186`	`186`	`}`
`187`	`187`	`if cluster.Spec.ControlPlaneRef == nil \|\|`
`188`		`- cluster.Spec.ControlPlaneRef.APIVersion != infrav1alpha.GroupVersion.Identifier() \|\|`
	`188`	`+ !matchesASOManagedAPIGroup(cluster.Spec.ControlPlaneRef.APIVersion) \|\|`
`189`	`189`	`cluster.Spec.ControlPlaneRef.Kind != infrav1alpha.AzureASOManagedControlPlaneKind {`
`190`	`190`	`return ctrl.Result{}, reconcile.TerminalError(fmt.Errorf("AzureASOManagedMachinePool cannot be used without AzureASOManagedControlPlane"))`
`191`	`191`	`}`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ func (r *ManagedClusterAdoptReconciler) Reconcile(ctx context.Context, req ctrl.`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`for _, owner := range managedCluster.GetOwnerReferences() {`
`91`		`- if owner.APIVersion == infrav1alpha.GroupVersion.Identifier() &&`
	`91`	`+ if matchesASOManagedAPIGroup(owner.APIVersion) &&`
`92`	`92`	`owner.Kind == infrav1alpha.AzureASOManagedControlPlaneKind {`
`93`	`93`	`return ctrl.Result{}, nil`
`94`	`94`	`}`