Fix review findings

Author: sbueringer

cmd/clusterctl/internal/test/fake_objects.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/ptr"
@@ -1562,6 +1563,9 @@ func (f *FakeClusterClass) Objs() []client.Object {
 	for o := range objMap {
 		setUID(o)
 	}
+	// GVK should be only set for setUID to avoid the wrong assumption that GVK is set on a
+	// ClusterClass in other parts of the code.
+	clusterClass.SetGroupVersionKind(schema.GroupVersionKind{})
 
 	for o, setOwnerReference := range objMap {
 		if setOwnerReference {

controlplane/kubeadm/internal/controllers/controller.go

@@ -308,7 +308,7 @@ func (r *KubeadmControlPlaneReconciler) initControlPlaneScope(ctx context.Contex
 		return nil, true, r.adoptMachines(ctx, kcp, adoptableMachines, cluster)
 	}
 
-	ownedMachines := controlPlaneMachines.Filter(collections.OwnedMachines(kcp))
+	ownedMachines := controlPlaneMachines.Filter(collections.OwnedMachines(kcp, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane").GroupKind()))
 	if kcp.DeletionTimestamp.IsZero() && len(ownedMachines) != len(controlPlaneMachines) {
 		err := errors.New("not all control plane machines are owned by this KubeadmControlPlane, refusing to operate in mixed management mode")
 		log.Error(err, "KCP cannot reconcile")

controlplane/kubeadm/internal/controllers/scale_test.go

@@ -88,7 +88,7 @@ func TestKubeadmControlPlaneReconciler_initializeControlPlane(t *testing.T) {
 	g.Expect(env.GetAPIReader().List(ctx, machineList, client.InNamespace(cluster.Namespace))).To(Succeed())
 	g.Expect(machineList.Items).To(HaveLen(1))
 
-	res, err := collections.GetFilteredMachinesForCluster(ctx, env.GetAPIReader(), cluster, collections.OwnedMachines(kcp))
+	res, err := collections.GetFilteredMachinesForCluster(ctx, env.GetAPIReader(), cluster, collections.OwnedMachines(kcp, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane").GroupKind()))
 	g.Expect(res).To(HaveLen(1))
 	g.Expect(err).ToNot(HaveOccurred())
 

docs/book/src/developer/providers/migrations/v1.11-to-v1.12.md

@@ -5,7 +5,13 @@ maintainers of providers and consumers of our Go API.
 
 ## Go version
 
-- The Go version used by Cluster API is Go 1.24.x
+- The minimal Go version required to build Cluster API is v1.24.x
+- The Go version used by Cluster API is v1.24.x
+
+## Dependencies
+
+- The Controller Runtime version used by Cluster API is v0.22.x
+- The version of the Kubernetes libraries used by Cluster API is v1.34.x
 
 ## Changes by Kind
 
@@ -17,6 +23,9 @@ maintainers of providers and consumers of our Go API.
 
 ### Other
 
+* `util.IsOwnedByObject`, `util.IsControlledBy` and `collections.OwnedMachines` now also require `schema.GroupKind` as input parameter.
+  `schema.GroupKind` is needed for cases where typed objects are passed in because controller-runtime does not guarantee that GVK is set on typed objects.
+
 ### Suggested changes for providers
 
 * For providers that copied the core Cluster API v1beta1 `APIEndpoint` struct and used it in their InfraCluster Go type 

util/collections/machine_filters.go

@@ -22,7 +22,9 @@ import (
 	"github.com/blang/semver/v4"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/selection"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	controlplanev1 "sigs.k8s.io/cluster-api/api/controlplane/kubeadm/v1beta2"
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
@@ -99,13 +101,13 @@ func InFailureDomains(failureDomains ...string) Func {
 }
 
 // OwnedMachines returns a filter to find all machines owned by specified owner.
-// Usage: GetFilteredMachinesForCluster(ctx, client, cluster, OwnedMachines(controlPlane)).
-func OwnedMachines(owner *controlplanev1.KubeadmControlPlane) func(machine *clusterv1.Machine) bool {
+// Usage: GetFilteredMachinesForCluster(ctx, client, cluster, OwnedMachines(controlPlane, controlPlaneGK)).
+func OwnedMachines(owner client.Object, ownerGK schema.GroupKind) func(machine *clusterv1.Machine) bool {
 	return func(machine *clusterv1.Machine) bool {
 		if machine == nil {
 			return false
 		}
-		return util.IsOwnedByObject(machine, owner, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane").GroupKind())
+		return util.IsOwnedByObject(machine, owner, ownerGK)
 	}
 }