Adjust to CR not setting TypeMeta anymore

Author: sbueringer

cmd/clusterctl/client/tree/discovery.go

@@ -22,6 +22,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
@@ -286,7 +287,7 @@ func addMachineDeploymentToObjectTree(ctx context.Context, c client.Client, clus
 			tree.Add(templateParent, machineTemplateRefObject, ObjectMetaName("MachineInfrastructureTemplate"))
 		}
 
-		machineSets := selectMachinesSetsControlledBy(machineSetList, md)
+		machineSets := selectMachinesSetsControlledBy(machineSetList, md, clusterv1.GroupVersion.WithKind("MachineDeployment").GroupKind())
 		for i := range machineSets {
 			ms := machineSets[i]
 
@@ -296,7 +297,7 @@ func addMachineDeploymentToObjectTree(ctx context.Context, c client.Client, clus
 				parent = ms
 			}
 
-			machines := selectMachinesControlledBy(machinesList, ms)
+			machines := selectMachinesControlledBy(machinesList, ms, clusterv1.GroupVersion.WithKind("MachineSet").GroupKind())
 			for _, w := range machines {
 				addMachineFunc(parent, w)
 			}
@@ -321,7 +322,7 @@ func addMachinePoolsToObjectTree(ctx context.Context, c client.Client, workers *
 			}
 		}
 
-		machines := selectMachinesControlledBy(machinesList, mp)
+		machines := selectMachinesControlledBy(machinesList, mp, clusterv1.GroupVersion.WithKind("MachinePool").GroupKind())
 		for _, m := range machines {
 			addMachineFunc(mp, m)
 		}
@@ -417,22 +418,22 @@ func selectControlPlaneMachines(machineList *clusterv1.MachineList) []*clusterv1
 	return machines
 }
 
-func selectMachinesSetsControlledBy(machineSetList *clusterv1.MachineSetList, controller client.Object) []*clusterv1.MachineSet {
+func selectMachinesSetsControlledBy(machineSetList *clusterv1.MachineSetList, controller client.Object, controllerGK schema.GroupKind) []*clusterv1.MachineSet {
 	machineSets := []*clusterv1.MachineSet{}
 	for i := range machineSetList.Items {
 		m := &machineSetList.Items[i]
-		if util.IsControlledBy(m, controller) {
+		if util.IsControlledBy(m, controller, controllerGK) {
 			machineSets = append(machineSets, m)
 		}
 	}
 	return machineSets
 }
 
-func selectMachinesControlledBy(machineList *clusterv1.MachineList, controller client.Object) []*clusterv1.Machine {
+func selectMachinesControlledBy(machineList *clusterv1.MachineList, controller client.Object, controllerGK schema.GroupKind) []*clusterv1.Machine {
 	machines := []*clusterv1.Machine{}
 	for i := range machineList.Items {
 		m := &machineList.Items[i]
-		if util.IsControlledBy(m, controller) {
+		if util.IsControlledBy(m, controller, controllerGK) {
 			machines = append(machines, m)
 		}
 	}

controlplane/kubeadm/internal/controllers/controller.go

@@ -1387,7 +1387,7 @@ func (r *KubeadmControlPlaneReconciler) adoptOwnedSecrets(ctx context.Context, k
 
 	for i := range secrets.Items {
 		s := secrets.Items[i]
-		if !util.IsOwnedByObject(&s, currentOwner) {
+		if !util.IsOwnedByObject(&s, currentOwner, bootstrapv1.GroupVersion.WithKind("KubeadmConfig").GroupKind()) {
 			continue
 		}
 		// avoid taking ownership of the bootstrap data secret

controlplane/kubeadm/internal/controllers/helpers.go

@@ -94,7 +94,7 @@ func (r *KubeadmControlPlaneReconciler) reconcileKubeconfig(ctx context.Context,
 	}
 
 	// only do rotation on owned secrets
-	if !util.IsControlledBy(configSecret, controlPlane.KCP) {
+	if !util.IsControlledBy(configSecret, controlPlane.KCP, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane").GroupKind()) {
 		return ctrl.Result{}, nil
 	}
 

controlplane/kubeadm/internal/workload_cluster_coredns_test.go

@@ -1139,10 +1139,6 @@ func (m *fakeMigrator) Migrate(_, _, _ string, _ bool) (string, error) {
 
 func newCoreDNSInfoDeploymentWithimage(image string) *appsv1.Deployment {
 	return &appsv1.Deployment{
-		TypeMeta: metav1.TypeMeta{
-			Kind:       "Deployment",
-			APIVersion: "apps/v1",
-		},
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      coreDNSKey,
 			Namespace: metav1.NamespaceSystem,

internal/controllers/cluster/cluster_controller.go

@@ -631,7 +631,7 @@ func (c *clusterDescendants) filterOwnedDescendants(cluster *clusterv1.Cluster)
 			return nil //nolint:nilerr // We don't want to exit the EachListItem loop, just continue
 		}
 
-		if util.IsOwnedByObject(acc, cluster) {
+		if util.IsOwnedByObject(acc, cluster, clusterv1.GroupVersion.WithKind("Cluster").GroupKind()) {
 			ownedDescendants = append(ownedDescendants, obj)
 		}
 

internal/controllers/cluster/cluster_controller_status.go

@@ -246,7 +246,7 @@ func setWorkersReplicas(_ context.Context, cluster *clusterv1.Cluster, machinePo
 	}
 
 	for _, ms := range machineSets.Items {
-		if !util.IsOwnedByObject(&ms, cluster) {
+		if !util.IsOwnedByObject(&ms, cluster, clusterv1.GroupVersion.WithKind("Cluster").GroupKind()) {
 			continue
 		}
 		if ms.Spec.Replicas != nil {
@@ -267,7 +267,7 @@ func setWorkersReplicas(_ context.Context, cluster *clusterv1.Cluster, machinePo
 	}
 
 	for _, m := range workerMachines.UnsortedList() {
-		if !util.IsOwnedByObject(m, cluster) {
+		if !util.IsOwnedByObject(m, cluster, clusterv1.GroupVersion.WithKind("Cluster").GroupKind()) {
 			continue
 		}
 		currentReplicas = ptr.To(ptr.Deref(currentReplicas, 0) + 1)
@@ -973,7 +973,7 @@ func setScalingUpCondition(ctx context.Context, cluster *clusterv1.Cluster, cont
 		ws = append(ws, aggregationWrapper{md: &md})
 	}
 	for _, ms := range machineSets.Items {
-		if !util.IsOwnedByObject(&ms, cluster) {
+		if !util.IsOwnedByObject(&ms, cluster, clusterv1.GroupVersion.WithKind("Cluster").GroupKind()) {
 			continue
 		}
 		ws = append(ws, aggregationWrapper{ms: &ms})
@@ -1050,7 +1050,7 @@ func setScalingDownCondition(ctx context.Context, cluster *clusterv1.Cluster, co
 		ws = append(ws, aggregationWrapper{md: &md})
 	}
 	for _, ms := range machineSets.Items {
-		if !util.IsOwnedByObject(&ms, cluster) {
+		if !util.IsOwnedByObject(&ms, cluster, clusterv1.GroupVersion.WithKind("Cluster").GroupKind()) {
 			continue
 		}
 		ws = append(ws, aggregationWrapper{ms: &ms})

util/collections/machine_filters.go

@@ -23,7 +23,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
 	"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"
@@ -101,12 +100,12 @@ 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 client.Object) func(machine *clusterv1.Machine) bool {
+func OwnedMachines(owner *controlplanev1.KubeadmControlPlane) func(machine *clusterv1.Machine) bool {
 	return func(machine *clusterv1.Machine) bool {
 		if machine == nil {
 			return false
 		}
-		return util.IsOwnedByObject(machine, owner)
+		return util.IsOwnedByObject(machine, owner, controlplanev1.GroupVersion.WithKind("KubeadmControlPlane").GroupKind())
 	}
 }
 

util/util.go

@@ -359,22 +359,22 @@ func indexOwnerRef(ownerReferences []metav1.OwnerReference, ref metav1.OwnerRefe
 
 // IsOwnedByObject returns true if any of the owner references point to the given target.
 // It matches the object based on the Group, Kind and Name.
-func IsOwnedByObject(obj metav1.Object, target client.Object) bool {
+func IsOwnedByObject(obj metav1.Object, target client.Object, targetGK schema.GroupKind) bool {
 	for _, ref := range obj.GetOwnerReferences() {
-		if refersTo(&ref, target) {
+		if refersTo(&ref, target, targetGK) {
 			return true
 		}
 	}
 	return false
 }
 
 // IsControlledBy differs from metav1.IsControlledBy. This function matches on Group, Kind and Name. The metav1.IsControlledBy function matches on UID only.
-func IsControlledBy(obj metav1.Object, owner client.Object) bool {
+func IsControlledBy(obj metav1.Object, owner client.Object, ownerGK schema.GroupKind) bool {
 	controllerRef := metav1.GetControllerOfNoCopy(obj)
 	if controllerRef == nil {
 		return false
 	}
-	return refersTo(controllerRef, owner)
+	return refersTo(controllerRef, owner, ownerGK)
 }
 
 // Returns true if a and b point to the same object based on Group, Kind and Name.
@@ -393,14 +393,13 @@ func referSameObject(a, b metav1.OwnerReference) bool {
 }
 
 // Returns true if ref refers to obj based on Group, Kind and Name.
-func refersTo(ref *metav1.OwnerReference, obj client.Object) bool {
+func refersTo(ref *metav1.OwnerReference, obj client.Object, objGK schema.GroupKind) bool {
 	refGv, err := schema.ParseGroupVersion(ref.APIVersion)
 	if err != nil {
 		return false
 	}
 
-	gvk := obj.GetObjectKind().GroupVersionKind()
-	return refGv.Group == gvk.Group && ref.Kind == gvk.Kind && ref.Name == obj.GetName()
+	return refGv.Group == objGK.Group && ref.Kind == objGK.Kind && ref.Name == obj.GetName()
 }
 
 // UnstructuredUnmarshalField is a wrapper around json and unstructured objects to decode and copy a specific field

util/util_test.go

@@ -345,13 +345,9 @@ func TestIsOwnedByObject(t *testing.T) {
 	targetName := "fri3ndsh1p"
 
 	meta := fakeMeta{
-		metav1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name: targetName,
 		},
-		metav1.TypeMeta{
-			APIVersion: "ponies.info/v1",
-			Kind:       targetKind,
-		},
 	}
 
 	tests := []struct {
@@ -437,7 +433,7 @@ func TestIsOwnedByObject(t *testing.T) {
 				OwnerReferences: test.refs,
 			}
 
-			g.Expect(IsOwnedByObject(pointer, &meta)).To(Equal(test.expected), "Could not find a ref to %+v in %+v", meta, test.refs)
+			g.Expect(IsOwnedByObject(pointer, &meta, schema.GroupKind{Group: "ponies.info", Kind: targetKind})).To(Equal(test.expected), "Could not find a ref to %+v in %+v", meta, test.refs)
 		})
 	}
 }