Fix validate CRD compatibility check and deprecated CRD test case

dinhxuanvu · dinhxuanvu · commit 1659664c798b · 2020-07-22T09:16:39.000-04:00
1. Fix validate CRD compatibility
Should only run against served versions instead the non-served
versions (! operator error)
2. Clean up the deprecated CRD versions test:
Using standup catsrc upgrade and get rid of unnecessary subscription
deletion.

Signed-off-by: Vu Dinh &lt;vdinh@redhat.com&gt;
diff --git a/pkg/controller/operators/catalog/operator.go b/pkg/controller/operators/catalog/operator.go
@@ -1376,7 +1376,7 @@ func (o *Operator) validateCustomResourceDefinition(oldCRD *v1beta1ext.CustomRes
 		return err
 	}
 	for _, version := range oldCRD.Spec.Versions {
-		if !version.Served {
+		if version.Served {
 			gvr := schema.GroupVersionResource{Group: oldCRD.Spec.Group, Version: version.Name, Resource: oldCRD.Spec.Names.Plural}
 			err := o.validateExistingCRs(gvr, convertedCRD)
 			if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -1376,7 +1376,7 @@ func (o Operator) validateCustomResourceDefinition(oldCRD v1beta1ext.CustomRes`
`1376`	`1376`	`return err`
`1377`	`1377`	`}`
`1378`	`1378`	`for _, version := range oldCRD.Spec.Versions {`
`1379`		`- if !version.Served {`
	`1379`	`+ if version.Served {`
`1380`	`1380`	`gvr := schema.GroupVersionResource{Group: oldCRD.Spec.Group, Version: version.Name, Resource: oldCRD.Spec.Names.Plural}`
`1381`	`1381`	`err := o.validateExistingCRs(gvr, convertedCRD)`
`1382`	`1382`	`if err != nil {`