NP-615: Bump github.com/openshift/api

go.mod

@@ -111,7 +111,7 @@ require (
 )
 
 require (
-	github.com/openshift/api v0.0.0-20231010075512-1ccc6058c62d
+	github.com/openshift/api v0.0.0-20231205121914-b5716b30456a
 	github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
 	github.com/openshift/library-go v0.0.0-20231123173213-a037480d443b
 	k8s.io/apiextensions-apiserver v0.28.4

go.sum

@@ -279,8 +279,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
 github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRahPmr4=
-github.com/openshift/api v0.0.0-20231010075512-1ccc6058c62d h1:KZRCA2bExuO7wU5MSvDu2Cs9qe9nFUTh3ITReJp7iaQ=
-github.com/openshift/api v0.0.0-20231010075512-1ccc6058c62d/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
+github.com/openshift/api v0.0.0-20231205121914-b5716b30456a h1:HdOIa5C84YZaiJ70IdPf5W0JUGOLjxCwf1PTPLpJ0QY=
+github.com/openshift/api v0.0.0-20231205121914-b5716b30456a/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k=
 github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
 github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=

pkg/controller/operconfig/cluster.go

@@ -54,8 +54,15 @@ func (r *ReconcileOperConfig) MergeClusterConfig(ctx context.Context, operConfig
 }
 
 func (r *ReconcileOperConfig) UpdateOperConfig(ctx context.Context, operConfig *operv1.Network) error {
-	operConfig.TypeMeta = metav1.TypeMeta{APIVersion: operv1.GroupVersion.String(), Kind: "Network"}
-	us, err := k8sutil.ToUnstructured(operConfig)
+	config := operConfig.DeepCopy()
+	// Since ApplyObject uses server side apply operconfig controller
+	// takes ownership of all fields set in operConfig.
+	// It shouldn't own .Spec.Migration as it is not modifying it anywhere.
+	// Setting the value to nil will ensure that the value of that field will stay unchanged (including the fieldManager).
+	config.Spec.Migration = nil
+
+	config.TypeMeta = metav1.TypeMeta{APIVersion: operv1.GroupVersion.String(), Kind: "Network"}
+	us, err := k8sutil.ToUnstructured(config)
 	if err != nil {
 		return fmt.Errorf("failed to transmute operator config, err: %v", err)
 	}