Merge pull request #4223 from cdoern/mcn-owner

OCPBUGS-30090: add node owner to MCN
openshift · Mar 1, 2024 · 922db99 · 922db99
2 parents 1738652 + fdf150e
commit 922db99
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -764,6 +764,14 @@ func (optr *Operator) syncMachineConfigNodes(_ *renderConfig) error {
 			},
 			ObjectMeta: metav1.ObjectMeta{
 				Name: node.Name,
+				OwnerReferences: []metav1.OwnerReference{
+					{
+						APIVersion: node.APIVersion,
+						Name:       node.ObjectMeta.Name,
+						Kind:       node.Kind,
+						UID:        node.ObjectMeta.UID,
+					},
+				},
 			},
 		}
 		mcsBytes, err := json.Marshal(newMCS)

diff --git a/pkg/upgrademonitor/upgrade_monitor.go b/pkg/upgrademonitor/upgrade_monitor.go
@@ -249,6 +249,14 @@ func GenerateAndApplyMachineConfigNodeSpec(fgAccessor featuregates.FeatureGateAc
 	mcNode, needNewMCNode := createOrGetMachineConfigNode(mcfgClient, node)
 	newMCNode := mcNode.DeepCopy()
 	// set the spec config version
+	newMCNode.ObjectMeta.OwnerReferences = []metav1.OwnerReference{
+		{
+			APIVersion: node.APIVersion,
+			Name:       node.ObjectMeta.Name,
+			Kind:       node.Kind,
+			UID:        node.ObjectMeta.UID,
+		},
+	}
 	newMCNode.Spec.ConfigVersion = mcfgalphav1.MachineConfigNodeSpecMachineConfigVersion{
 		Desired: node.Annotations["machineconfiguration.openshift.io/desiredConfig"],
 	}