Merge pull request #11690 from k8s-infra-cherrypick-robot/cherry-pick-11688-to-release-1.8

[release-1.8] 🐛 Also patch external refs if the UID differs

Author: k8s-ci-robot

internal/controllers/cluster/cluster_controller_phases.go

@@ -134,6 +134,7 @@ func ensureOwnerRefAndLabel(ctx context.Context, c client.Client, obj *unstructu
 		APIVersion: clusterv1.GroupVersion.String(),
 		Kind:       "Cluster",
 		Name:       cluster.Name,
+		UID:        cluster.UID,
 		Controller: ptr.To(true),
 	}
 

internal/controllers/clusterclass/clusterclass_controller.go

@@ -401,6 +401,7 @@ func (r *Reconciler) reconcileExternal(ctx context.Context, clusterClass *cluste
 		APIVersion: clusterv1.GroupVersion.String(),
 		Kind:       "ClusterClass",
 		Name:       clusterClass.Name,
+		UID:        clusterClass.UID,
 	}
 
 	if util.HasExactOwnerRef(obj.GetOwnerReferences(), desiredOwnerRef) {

internal/controllers/machine/machine_controller_phases.go

@@ -149,6 +149,7 @@ func (r *Reconciler) ensureExternalOwnershipAndWatch(ctx context.Context, cluste
 		APIVersion: clusterv1.GroupVersion.String(),
 		Kind:       "Machine",
 		Name:       m.Name,
+		UID:        m.UID,
 		Controller: ptr.To(true),
 	}
 

util/util.go

@@ -342,6 +342,7 @@ func HasExactOwnerRef(ownerReferences []metav1.OwnerReference, ref metav1.OwnerR
 		if r.APIVersion == ref.APIVersion &&
 			r.Kind == ref.Kind &&
 			r.Name == ref.Name &&
+			r.UID == ref.UID &&
 			ptr.Deref(r.Controller, false) == ptr.Deref(ref.Controller, false) {
 			return true
 		}