Use a newer quay version for operatorpolicy tests

From some test runs, it seems like some of the 3.8.x releases do not always have the quayecosystems CRD, which makes the tests inconsistent. From what I can tell, *none* of the 3.10.x releases will have that CRD, so it should be consistent. Signed-off-by: Justin Kulikauskas <jkulikau@redhat.com>
stolostron · May 2, 2024 · cf5224b · cf5224b
1 parent b080562
commit cf5224b
Show file tree

Hide file tree

Showing 10 changed files with 73 additions and 71 deletions.
diff --git a/test/e2e/case38_install_operator_test.go b/test/e2e/case38_install_operator_test.go
@@ -734,8 +734,8 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 	})
 	Describe("Test health checks on OLM resources after OperatorPolicy operator installation", Ordered, func() {
 		const (
-			opPolYAML        = "../resources/case38_operator_install/operator-policy-no-group-enforce.yaml"
-			opPolName        = "oppol-no-group-enforce"
+			opPolYAML        = "../resources/case38_operator_install/operator-policy-no-group-enforce-one-version.yaml"
+			opPolName        = "oppol-no-group-enforce-one-version"
 			opPolNoExistYAML = "../resources/case38_operator_install/operator-policy-no-exist-enforce.yaml"
 			opPolNoExistName = "oppol-no-exist-enforce"
 		)
@@ -755,7 +755,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 		It("Should generate conditions and relatedobjects of CSV", func(ctx SpecContext) {
 			Eventually(func(ctx SpecContext) string {
 				csv, _ := clientManagedDynamic.Resource(gvrClusterServiceVersion).Namespace(opPolTestNS).
-					Get(ctx, "quay-operator.v3.8.13", metav1.GetOptions{})
+					Get(ctx, "quay-operator.v3.10.0", metav1.GetOptions{})
 
 				if csv == nil {
 					return ""
@@ -781,11 +781,11 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					Type:   "ClusterServiceVersionCompliant",
 					Status: metav1.ConditionTrue,
 					Reason: "InstallSucceeded",
-					Message: "ClusterServiceVersion (quay-operator.v3.8.13) - install strategy completed with " +
+					Message: "ClusterServiceVersion (quay-operator.v3.10.0) - install strategy completed with " +
 						"no errors",
 				},
 				regexp.QuoteMeta(
-					"ClusterServiceVersion (quay-operator.v3.8.13) - install strategy completed with no errors",
+					"ClusterServiceVersion (quay-operator.v3.10.0) - install strategy completed with no errors",
 				),
 			)
 		})
@@ -1407,16 +1407,6 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					},
 					Compliant: "Compliant",
 					Reason:    "Resource found as expected",
-				}, {
-					Object: policyv1.ObjectResource{
-						Kind:       "CustomResourceDefinition",
-						APIVersion: "apiextensions.k8s.io/v1",
-						Metadata: policyv1.ObjectMetadata{
-							Name: "quayecosystems.redhatcop.redhat.io",
-						},
-					},
-					Compliant: "Compliant",
-					Reason:    "Resource found as expected",
 				}},
 				metav1.Condition{
 					Type:    "CustomResourceDefinitionCompliant",
@@ -1744,17 +1734,6 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 				return crd
 			}, olmWaitTimeout, 5, ctx).ShouldNot(BeNil())
 
-			By("Waiting for the policy to become compliant, indicating the operator is installed")
-			Eventually(func(g Gomega) string {
-				pol := utils.GetWithTimeout(clientManagedDynamic, gvrOperatorPolicy, opPolName,
-					opPolTestNS, true, eventuallyTimeout)
-				compliance, found, err := unstructured.NestedString(pol.Object, "status", "compliant")
-				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(found).To(BeTrue())
-
-				return compliance
-			}, olmWaitTimeout, 5, ctx).Should(Equal("Compliant"))
-
 			// Revert to the original mustnothave policy
 			utils.Kubectl("patch", "operatorpolicy", opPolName, "-n", opPolTestNS, "--type=json", "-p",
 				`[{"op": "replace", "path": "/spec/complianceType", "value": "mustnothave"},`+
@@ -1819,6 +1798,16 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					},
 					Compliant: "Compliant",
 					Reason:    "Resource found but will not be handled in mustnothave mode",
+				}, {
+					Object: policyv1.ObjectResource{
+						Kind:       "InstallPlan",
+						APIVersion: "operators.coreos.com/v1alpha1",
+						Metadata: policyv1.ObjectMetadata{
+							Namespace: opPolTestNS,
+						},
+					},
+					Compliant: "Compliant",
+					Reason:    "Resource found but will not be handled in mustnothave mode",
 				}},
 				metav1.Condition{
 					Type:    "InstallPlanCompliant",
@@ -1846,24 +1835,14 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					Type:    "ClusterServiceVersionCompliant",
 					Status:  metav1.ConditionFalse,
 					Reason:  "ClusterServiceVersionPresent",
-					Message: "the ClusterServiceVersion (quay-operator.v3.8.13) is present",
+					Message: "the ClusterServiceVersion (quay-operator.v3.10.0) is present",
 				},
-				regexp.QuoteMeta("the ClusterServiceVersion (quay-operator.v3.8.13) is present"),
+				regexp.QuoteMeta("the ClusterServiceVersion (quay-operator.v3.10.0) is present"),
 			)
 			check(
 				opPolName,
 				true,
 				[]policyv1.RelatedObject{{
-					Object: policyv1.ObjectResource{
-						Kind:       "CustomResourceDefinition",
-						APIVersion: "apiextensions.k8s.io/v1",
-						Metadata: policyv1.ObjectMetadata{
-							Name: "quayecosystems.redhatcop.redhat.io",
-						},
-					},
-					Compliant: "NonCompliant",
-					Reason:    "Resource found but should not exist",
-				}, {
 					Object: policyv1.ObjectResource{
 						Kind:       "CustomResourceDefinition",
 						APIVersion: "apiextensions.k8s.io/v1",
@@ -1955,16 +1934,6 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 				opPolName,
 				false,
 				[]policyv1.RelatedObject{{
-					Object: policyv1.ObjectResource{
-						Kind:       "CustomResourceDefinition",
-						APIVersion: "apiextensions.k8s.io/v1",
-						Metadata: policyv1.ObjectMetadata{
-							Name: "quayecosystems.redhatcop.redhat.io",
-						},
-					},
-					Reason: "The CustomResourceDefinition is attached to a mustnothave policy, but " +
-						"does not need to be removed",
-				}, {
 					Object: policyv1.ObjectResource{
 						Kind:       "CustomResourceDefinition",
 						APIVersion: "apiextensions.k8s.io/v1",
@@ -2002,12 +1971,10 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 			keptChecks()
 
 			By("Checking that certain (named) resources are still there")
-			utils.GetWithTimeout(clientManagedDynamic, gvrClusterServiceVersion, "quay-operator.v3.8.13",
+			utils.GetWithTimeout(clientManagedDynamic, gvrClusterServiceVersion, "quay-operator.v3.10.0",
 				opPolTestNS, true, eventuallyTimeout)
 			utils.GetWithTimeout(clientManagedDynamic, gvrSubscription, subName,
 				opPolTestNS, true, eventuallyTimeout)
-			utils.GetWithTimeout(clientManagedDynamic, gvrCRD, "quayecosystems.redhatcop.redhat.io",
-				"", true, eventuallyTimeout)
 			utils.GetWithTimeout(clientManagedDynamic, gvrCRD, "quayregistries.quay.redhat.com",
 				"", true, eventuallyTimeout)
 		})
@@ -2129,6 +2096,17 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					},
 					Compliant: "Compliant",
 					Reason:    "Resource found but will not be handled in mustnothave mode",
+				}, {
+					Object: policyv1.ObjectResource{
+						Kind:       "InstallPlan",
+						APIVersion: "operators.coreos.com/v1alpha1",
+						Metadata: policyv1.ObjectMetadata{
+							Name:      installPlanName,
+							Namespace: opPolTestNS,
+						},
+					},
+					Compliant: "Compliant",
+					Reason:    "Resource found but will not be handled in mustnothave mode",
 				}},
 				metav1.Condition{
 					Type:    "InstallPlanCompliant",
@@ -2190,12 +2168,10 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 		})
 		It("Should report things as gone after the finalizers are removed", func() {
 			By("Checking that certain (named) resources are not there, indicating the removal was completed")
-			utils.GetWithTimeout(clientManagedDynamic, gvrClusterServiceVersion, "quay-operator.v3.8.13",
+			utils.GetWithTimeout(clientManagedDynamic, gvrClusterServiceVersion, "quay-operator.v3.10.0",
 				opPolTestNS, false, eventuallyTimeout)
 			utils.GetWithTimeout(clientManagedDynamic, gvrSubscription, subName,
 				opPolTestNS, false, eventuallyTimeout)
-			utils.GetWithTimeout(clientManagedDynamic, gvrCRD, "quayecosystems.redhatcop.redhat.io",
-				"", false, eventuallyTimeout)
 			utils.GetWithTimeout(clientManagedDynamic, gvrCRD, "quayregistries.quay.redhat.com",
 				"", false, eventuallyTimeout)
 
@@ -2290,7 +2266,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 					Reason:  "ClusterServiceVersionNotPresent",
 					Message: "the ClusterServiceVersion is not present",
 				},
-				regexp.QuoteMeta("the ClusterServiceVersion (quay-operator.v3.8.13) was deleted"),
+				regexp.QuoteMeta("the ClusterServiceVersion (quay-operator.v3.10.0) was deleted"),
 			)
 			check(
 				opPolName,
@@ -2728,7 +2704,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() {
 
 		It("Should update the subscription after the configmap is updated", func(ctx SpecContext) {
 			utils.Kubectl("patch", "configmap", "op-config", "-n", opPolTestNS, "--type=json", "-p",
-				`[{"op": "replace", "path": "/data/channel", "value": "stable-3.8"}]`)
+				`[{"op": "replace", "path": "/data/channel", "value": "stable-3.10"}]`)
 
 			check(
 				opPolName,

diff --git a/test/resources/case38_operator_install/operator-policy-mustnothave.yaml b/test/resources/case38_operator_install/operator-policy-mustnothave.yaml
@@ -15,15 +15,15 @@ spec:
   severity: medium
   complianceType: mustnothave
   subscription:
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay
     namespace: operator-policy-testns
     installPlanApproval: Manual
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.13
+    startingCSV: quay-operator.v3.10.0
   versions:
-    - quay-operator.v3.8.13
+    - quay-operator.v3.10.0
   removalBehavior:
     operatorGroups: DeleteIfUnused
     subscriptions: Delete

diff --git a/test/resources/case38_operator_install/operator-policy-no-exist-enforce.yaml b/test/resources/case38_operator_install/operator-policy-no-exist-enforce.yaml
@@ -15,7 +15,7 @@ spec:
   severity: medium
   complianceType: musthave
   subscription:
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay-does-not-exist
     namespace: operator-policy-testns
     installPlanApproval: Automatic

diff --git a/test/resources/case38_operator_install/operator-policy-no-group-enforce-one-version.yaml b/test/resources/case38_operator_install/operator-policy-no-group-enforce-one-version.yaml
@@ -0,0 +1,26 @@
+apiVersion: policy.open-cluster-management.io/v1beta1
+kind: OperatorPolicy
+metadata:
+  name: oppol-no-group-enforce-one-version
+  annotations:
+    policy.open-cluster-management.io/parent-policy-compliance-db-id: "124"
+    policy.open-cluster-management.io/policy-compliance-db-id: "64"
+  ownerReferences:
+  - apiVersion: policy.open-cluster-management.io/v1
+    kind: Policy
+    name: parent-policy
+    uid: 12345678-90ab-cdef-1234-567890abcdef # must be replaced before creation
+spec:
+  remediationAction: enforce
+  severity: medium
+  complianceType: musthave
+  subscription:
+    channel: stable-3.10
+    name: project-quay
+    namespace: operator-policy-testns
+    installPlanApproval: Automatic
+    source: operatorhubio-catalog
+    sourceNamespace: olm
+    startingCSV: quay-operator.v3.10.0
+  versions:
+  - quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/operator-policy-no-group-enforce.yaml b/test/resources/case38_operator_install/operator-policy-no-group-enforce.yaml
@@ -15,10 +15,10 @@ spec:
   severity: medium
   complianceType: musthave
   subscription:
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay
     namespace: operator-policy-testns
     installPlanApproval: Automatic
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.13
+    startingCSV: quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/operator-policy-no-group.yaml b/test/resources/case38_operator_install/operator-policy-no-group.yaml
@@ -15,10 +15,10 @@ spec:
   severity: medium
   complianceType: musthave
   subscription:
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay
     namespace: operator-policy-testns
     installPlanApproval: Automatic
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.1
+    startingCSV: quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/operator-policy-validity-test.yaml b/test/resources/case38_operator_install/operator-policy-validity-test.yaml
@@ -22,10 +22,10 @@ spec:
       - operator-policy-testns
   subscription:
     actually: incorrect
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay
     namespace: nonexist-testns
     installPlanApproval: Incorrect
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.1
+    startingCSV: quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/operator-policy-with-group.yaml b/test/resources/case38_operator_install/operator-policy-with-group.yaml
@@ -20,10 +20,10 @@ spec:
     targetNamespaces:
       - operator-policy-testns
   subscription:
-    channel: stable-3.8
+    channel: stable-3.10
     name: project-quay
     namespace: operator-policy-testns
     installPlanApproval: Automatic
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.1
+    startingCSV: quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/operator-policy-with-templates.yaml b/test/resources/case38_operator_install/operator-policy-with-templates.yaml
@@ -25,4 +25,4 @@ spec:
     installPlanApproval: Automatic
     source: operatorhubio-catalog
     sourceNamespace: olm
-    startingCSV: quay-operator.v3.8.1
+    startingCSV: quay-operator.v3.10.0
diff --git a/test/resources/case38_operator_install/subscription.yaml b/test/resources/case38_operator_install/subscription.yaml
@@ -3,9 +3,9 @@ kind: Subscription
 metadata:
   name: project-quay
 spec:
-  channel: stable-3.8
+  channel: stable-3.10
   name: project-quay
   installPlanApproval: Automatic
   source: operatorhubio-catalog
   sourceNamespace: olm
-  startingCSV: quay-operator.v3.8.1
+  startingCSV: quay-operator.v3.10.0