Merge pull request #924 from openshift-cherrypick-robot/cherry-pick-921-to-release-4.13

[release-4.13] OCPBUGS-47507: CRD upgrade existing CR validation fix (#3442)

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

@@ -1911,15 +1911,15 @@ func validateExistingCRs(dynamicClient dynamic.Interface, gvr schema.GroupVersio
 		return dynamicClient.Resource(gvr).List(context.TODO(), opts)
 	}))
 	validationFn := func(obj runtime.Object) error {
+		// lister will only provide unstructured objects as runtime.Object, so this should never fail to convert
+		// if it does, it's a programming error
+		cr := obj.(*unstructured.Unstructured)
 		validator, _, err := validation.NewSchemaValidator(newCRD.Spec.Validation)
 		if err != nil {
 			return fmt.Errorf("error creating validator for schema %#v: %s", newCRD.Spec.Validation, err)
 		}
-		err = validation.ValidateCustomResource(field.NewPath(""), obj, validator).ToAggregate()
+		err = validation.ValidateCustomResource(field.NewPath(""), cr.UnstructuredContent(), validator).ToAggregate()
 		if err != nil {
-			// lister will only provide unstructured objects as runtime.Object, so this should never fail to convert
-			// if it does, it's a programming error
-			cr := obj.(*unstructured.Unstructured)
 			var namespacedName string
 			if cr.GetNamespace() == "" {
 				namespacedName = cr.GetName()

staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator_test.go

@@ -1404,6 +1404,18 @@ func TestValidateExistingCRs(t *testing.T) {
 			newCRD: unversionedCRDForV1beta1File("testdata/hivebug/crd.yaml"),
 			want:   fmt.Errorf("error validating hive.openshift.io/v1, Kind=MachinePool \"test\": updated validation is too restrictive: [[].spec.clusterDeploymentRef: Invalid value: \"null\": spec.clusterDeploymentRef in body must be of type object: \"null\", [].spec.name: Required value, [].spec.platform: Required value]"),
 		},
+		{
+			name: "crd with incorrect comparison",
+			existingObjects: []runtime.Object{
+				unstructuredForFile("testdata/postgrestolerations/pgadmin.cr.yaml"),
+			},
+			gvr: schema.GroupVersionResource{
+				Group:    "postgres-operator.crunchydata.com",
+				Version:  "v1beta1",
+				Resource: "pgadmins",
+			},
+			newCRD: unversionedCRDForV1beta1File("testdata/postgrestolerations/crd.yaml"),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {