diff --git a/test/e2e/case38_install_operator_test.go b/test/e2e/case38_install_operator_test.go index d0924df2..a6daaa6d 100644 --- a/test/e2e/case38_install_operator_test.go +++ b/test/e2e/case38_install_operator_test.go @@ -1374,16 +1374,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", @@ -1821,16 +1811,6 @@ var _ = Describe("Testing OperatorPolicy", Ordered, func() { 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", @@ -1922,16 +1902,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", diff --git a/test/resources/case38_operator_install/operator-policy-mustnothave.yaml b/test/resources/case38_operator_install/operator-policy-mustnothave.yaml index 0396c68c..7f00835d 100644 --- 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 index 13657edb..62d839ec 100644 --- 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.yaml b/test/resources/case38_operator_install/operator-policy-no-group-enforce.yaml index 23438359..3fb106bc 100644 --- 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 index 89a49d3b..1509aea6 100644 --- 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 index 12d4e0eb..4bf51998 100644 --- 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 index 70ddb8c6..cfc89a2f 100644 --- 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 \ No newline at end of file + startingCSV: quay-operator.v3.10.0 \ No newline at end of file diff --git a/test/resources/case38_operator_install/operator-policy-with-templates.yaml b/test/resources/case38_operator_install/operator-policy-with-templates.yaml index 292b1eb0..de56c398 100644 --- 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 index c4592a1d..a4eddf43 100644 --- 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