Merge pull request #11688 from sbueringer/pr-patch-uid-diff

🐛 Also patch external refs if the UID differs
kubernetes-sigs · Jan 15, 2025 · 07d97c6 · 07d97c6
2 parents 7b6626f + 3025f52
commit 07d97c6
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/internal/controllers/cluster/cluster_controller_phases.go b/internal/controllers/cluster/cluster_controller_phases.go
@@ -131,6 +131,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),
 	}
 

diff --git a/internal/controllers/clusterclass/clusterclass_controller.go b/internal/controllers/clusterclass/clusterclass_controller.go
@@ -434,6 +434,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) {

diff --git a/internal/controllers/machine/machine_controller_phases.go b/internal/controllers/machine/machine_controller_phases.go
@@ -98,6 +98,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),
 	}
 

diff --git a/util/util.go b/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
 		}