Merge pull request #2266 from npinaeva/ocpbugs-29300

[release-4.14] OCPBUGS-29300: Update ingressconfig_controller to use field Manager
openshift · Feb 13, 2024 · b7ebd94 · b7ebd94
2 parents 41930d5 + c98b61b
commit b7ebd94
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/controller/ingressconfig/ingressconfig_controller.go b/pkg/controller/ingressconfig/ingressconfig_controller.go
@@ -142,5 +142,7 @@ func (r *ReconcileIngressConfigs) updatePolicyGroupLabelOnNamespace(ctx context.
 
 	newNamespace.SetLabels(existingLabels)
 
-	return r.client.Patch(context.TODO(), newNamespace, crclient.MergeFrom(namespace))
+	return r.client.Patch(context.TODO(), newNamespace, crclient.MergeFrom(namespace), &crclient.PatchOptions{
+		FieldManager: "cluster-network-operator/ingress_controller",
+	})
 }