Remove field manager setting and testing

Author: DavidHurta

pkg/cvo/configuration/configuration.go

@@ -136,7 +136,7 @@ func (config *ClusterVersionOperatorConfiguration) sync(ctx context.Context, des
 	if desiredConfig.Status.ObservedGeneration != desiredConfig.Generation {
 		newConfig := desiredConfig.DeepCopy()
 		newConfig.Status.ObservedGeneration = desiredConfig.Generation
-		_, err := config.client.UpdateStatus(ctx, newConfig, metav1.UpdateOptions{FieldManager: "cluster-version-operator"})
+		_, err := config.client.UpdateStatus(ctx, newConfig, metav1.UpdateOptions{})
 		if err != nil {
 			return fmt.Errorf("failed to update the ClusterVersionOperator resource: %w", err)
 		}

pkg/cvo/configuration/configuration_test.go

@@ -7,23 +7,16 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
 	operatorv1 "github.com/openshift/api/operator/v1"
 	operatorv1alpha1 "github.com/openshift/api/operator/v1alpha1"
 	operatorclientsetfake "github.com/openshift/client-go/operator/clientset/versioned/fake"
 	operatorexternalversions "github.com/openshift/client-go/operator/informers/externalversions"
-	apierrors "k8s.io/apimachinery/pkg/api/errors"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var expectedManagedFieldsEntry = metav1.ManagedFieldsEntry{
-	Manager:    "cluster-version-operator",
-	Operation:  "Update",
-	APIVersion: "operator.openshift.io/v1alpha1",
-}
-
-var ignoreNotTestedManagedFieldsEntryFields = cmpopts.IgnoreFields(
-	metav1.ManagedFieldsEntry{}, "Time", "FieldsType", "FieldsV1")
-
 func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 	tests := []struct {
 		name                   string
@@ -36,17 +29,15 @@ func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 			name: "first sync run correctly updates the status",
 			config: operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Generation:    1,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Generation: 1,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.Normal,
 				},
 			},
 			expectedConfig: operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Generation:    1,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Generation: 1,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.Normal,
@@ -79,8 +70,7 @@ func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 			},
 			expectedConfig: operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Generation:    3,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Generation: 3,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.Normal,
@@ -113,8 +103,7 @@ func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 			},
 			expectedConfig: operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Generation:    4,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Generation: 4,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.Trace,
@@ -147,8 +136,7 @@ func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 			},
 			expectedConfig: operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Generation:    40,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Generation: 40,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.TraceAll,
@@ -191,7 +179,7 @@ func TestClusterVersionOperatorConfiguration_sync(t *testing.T) {
 			if err != nil {
 				t.Errorf("unexpected error %v", err)
 			}
-			if diff := cmp.Diff(tt.expectedConfig, *config, ignoreNotTestedManagedFieldsEntryFields); diff != "" {
+			if diff := cmp.Diff(tt.expectedConfig, *config, cmpopts.IgnoreFields(metav1.ObjectMeta{}, "ManagedFields")); diff != "" {
 				t.Errorf("unexpected config (-want, +got) = %v", diff)
 			}
 
@@ -228,9 +216,8 @@ func TestClusterVersionOperatorConfiguration_Sync(t *testing.T) {
 			},
 			expectedConfig: &operatorv1alpha1.ClusterVersionOperator{
 				ObjectMeta: metav1.ObjectMeta{
-					Name:          "cluster",
-					Generation:    4,
-					ManagedFields: []metav1.ManagedFieldsEntry{expectedManagedFieldsEntry},
+					Name:       "cluster",
+					Generation: 4,
 				},
 				Spec: operatorv1alpha1.ClusterVersionOperatorSpec{
 					OperatorLogLevel: operatorv1.Trace,
@@ -279,7 +266,7 @@ func TestClusterVersionOperatorConfiguration_Sync(t *testing.T) {
 			case apierrors.IsNotFound(err) && tt.expectedConfig != nil:
 				t.Errorf("expected config to be '%v', got NotFound", *tt.expectedConfig)
 			case err == nil:
-				if diff := cmp.Diff(*tt.expectedConfig, *config, ignoreNotTestedManagedFieldsEntryFields); diff != "" {
+				if diff := cmp.Diff(*tt.expectedConfig, *config, cmpopts.IgnoreFields(metav1.ObjectMeta{}, "ManagedFields")); diff != "" {
 					t.Errorf("unexpected config (-want, +got) = %v", diff)
 				}
 			}