operator: add test for multiple-same-operators (#973)

* operator: add positive test for multiple-same-operators * Add negative test
redhat-best-practices-for-k8s · Nov 4, 2024 · e03d6c8 · e03d6c8
1 parent 4f15096
commit e03d6c8
Show file tree

Hide file tree

Showing 13 changed files with 286 additions and 6 deletions.
diff --git a/tests/affiliatedcertification/helper/helper.go b/tests/affiliatedcertification/helper/helper.go
@@ -99,10 +99,10 @@ func GetCsvByPrefix(prefixCsvName string, namespace string) (*v1alpha1.ClusterSe
 	return &neededCSV, nil
 }
 
-func DeployOperatorSubscription(operatorPackage, channel, namespace, group,
+func DeployOperatorSubscription(subscriptionName, operatorPackage, channel, namespace, group,
 	sourceNamespace, startingCSV string, installApproval v1alpha1.Approval) error {
 	operatorSubscription := utils.DefineSubscription(
-		operatorPackage+"-subscription",
+		subscriptionName+"-subscription",
 		namespace,
 		channel,
 		operatorPackage,

diff --git a/tests/affiliatedcertification/tests/affiliated_certification_invalid_operator.go b/tests/affiliatedcertification/tests/affiliated_certification_invalid_operator.go
@@ -53,6 +53,7 @@ var _ = Describe("Affiliated-certification invalid operator certification,", Ser
 		By(fmt.Sprintf("Deploy nginx-ingress-operator%s for testing", "."+version))
 		// nginx-ingress-operator: in certified-operators group and version is certified
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.CertifiedOperatorPrefixNginx,
 			tsparams.CertifiedOperatorPrefixNginx,
 			channel,
 			randomNamespace,
@@ -91,6 +92,7 @@ var _ = Describe("Affiliated-certification invalid operator certification,", Ser
 
 		By("Deploy sriov-fec operator with uncertified version")
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.UncertifiedOperatorPrefixSriov,
 			tsparams.UncertifiedOperatorPrefixSriov,
 			"stable",
 			randomNamespace,

diff --git a/tests/affiliatedcertification/tests/affiliated_certification_operator.go b/tests/affiliatedcertification/tests/affiliated_certification_operator.go
@@ -35,6 +35,7 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
 		By("Deploy cockroachdb for testing")
 		// cockroachdb: not in certified-operators group in catalog, for negative test cases
 		err := tshelper.DeployOperatorSubscription(
+			"cockroachdb",
 			"cockroachdb",
 			"stable-v6.x",
 			randomNamespace,
@@ -67,6 +68,7 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
 		By(fmt.Sprintf("Deploy cockroachdb-certified operator %s for testing", "v"+version))
 		// cockroachdb-certified operator: in certified-operators group and version is certified
 		err = tshelper.DeployOperatorSubscription(
+			"cockroachdb-certified",
 			"cockroachdb-certified",
 			channel,
 			randomNamespace,
@@ -99,6 +101,7 @@ var _ = Describe("Affiliated-certification operator certification,", Serial, fun
 		By(fmt.Sprintf("Deploy nginx-ingress-operator.v%s for testing", version))
 		// nginx-ingress-operator: in certified-operators group and version is certified
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.CertifiedOperatorPrefixNginx,
 			tsparams.CertifiedOperatorPrefixNginx,
 			channel,
 			randomNamespace,

diff --git a/tests/globalhelper/operator.go b/tests/globalhelper/operator.go
@@ -184,6 +184,40 @@ func DeployRHCertifiedOperatorSource(ocpVersion string) error {
 	return nil
 }
 
+func DeleteCustomOperatorSource() error {
+	return DeleteCatalogSource("custom-catalog", "openshift-marketplace", "Custom Index")
+}
+
+func DeployCustomOperatorSource() error {
+	err := GetAPIClient().Create(context.TODO(),
+		&v1alpha1.CatalogSource{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      "custom-catalog",
+				Namespace: "openshift-marketplace",
+			},
+			Spec: v1alpha1.CatalogSourceSpec{
+				SourceType:  "grpc",
+				Image:       "quay.io/deliedit/test:catalog-index-test",
+				DisplayName: "Custom Index",
+				Publisher:   "CertsuiteTeam",
+				UpdateStrategy: &v1alpha1.UpdateStrategy{
+					RegistryPoll: &v1alpha1.RegistryPoll{
+						Interval: &metav1.Duration{
+							Duration: 30 * time.Minute}},
+				},
+			},
+		},
+	)
+
+	if k8serrors.IsAlreadyExists(err) {
+		return nil
+	} else if err != nil {
+		return fmt.Errorf("can not deploy catalog source %w", err)
+	}
+
+	return nil
+}
+
 func DisableCatalogSource(name string) error {
 	return setCatalogSource(true, name)
 }

diff --git a/tests/operator/helper/helper.go b/tests/operator/helper/helper.go
@@ -106,10 +106,10 @@ func GetCsvByPrefix(prefixCsvName string, namespace string) (*v1alpha1.ClusterSe
 	return &neededCSV, nil
 }
 
-func DeployOperatorSubscription(operatorPackage, channel, namespace, group,
+func DeployOperatorSubscription(subscriptionName, operatorPackage, channel, namespace, group,
 	sourceNamespace, startingCSV string, installApproval v1alpha1.Approval) error {
 	operatorSubscription := utils.DefineSubscription(
-		operatorPackage+"-subscription",
+		subscriptionName+"-subscription",
 		namespace,
 		channel,
 		operatorPackage,

diff --git a/tests/operator/parameters/parameters.go b/tests/operator/parameters/parameters.go
@@ -63,4 +63,5 @@ const (
 	CertsuiteOperatorNonRoot                   = "operator-run-as-non-root"
 	CertsuiteOperatorPodAutomountToken         = "operator-automount-tokens"
 	CertsuiteOperatorPodRunAsUserID            = "operator-run-as-user-id"
+	CertsuiteOperatorMultipleInstalled         = "operator-multiple-same-operators"
 )
diff --git a/tests/operator/tests/operator_crd_openapi_schema.go b/tests/operator/tests/operator_crd_openapi_schema.go
@@ -37,6 +37,7 @@ var _ = Describe("Operator crd-openapi-schema", func() {
 
 		By("Deploy openvino operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"ovms-operator",
 			"ovms-operator",
 			"alpha",
 			randomNamespace,

diff --git a/tests/operator/tests/operator_crd_versioning.go b/tests/operator/tests/operator_crd_versioning.go
@@ -37,6 +37,7 @@ var _ = Describe("Operator crd-versioning,", func() {
 
 		By("Deploy openvino operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"ovms-operator",
 			"ovms-operator",
 			"alpha",
 			randomNamespace,

diff --git a/tests/operator/tests/operator_install_source.go b/tests/operator/tests/operator_install_source.go
@@ -73,18 +73,19 @@ var _ = Describe("Operator install-source,", Serial, func() {
 
 		By("Query the packagemanifest for defaultChannel for " + clusterLoggingOperatorName)
 		channel, err := globalhelper.QueryPackageManifestForDefaultChannel(clusterLoggingOperatorName, randomNamespace)
-		Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for nginx-ingress-operator")
+		Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for "+clusterLoggingOperatorName)
 
 		fmt.Printf("CHANNEL FOUND: %s\n", channel)
 
 		By("Query the packagemanifest for the " + clusterLoggingOperatorName)
 		version, err := globalhelper.QueryPackageManifestForVersion(clusterLoggingOperatorName, randomNamespace, channel)
-		Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for nginx-ingress-operator")
+		Expect(err).ToNot(HaveOccurred(), "Error querying package manifest for "+clusterLoggingOperatorName)
 
 		fmt.Printf("VERSION FOUND: %s\n", version)
 
 		By("Deploy cluster-logging operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			clusterLoggingOperatorName,
 			clusterLoggingOperatorName,
 			channel,
 			openshiftLoggingNamespace,
@@ -138,6 +139,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 		By(fmt.Sprintf("Deploy nginx-ingress-operator%s for testing", "."+version))
 		// nginx-ingress-operator: in certified-operators group and version is certified
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.CertifiedOperatorPrefixNginx,
 			tsparams.CertifiedOperatorPrefixNginx,
 			channel,
 			randomNamespace,
@@ -182,6 +184,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 	It("one operator not installed with OLM [negative]", func() {
 		By("Deploy openvino operator for testing")
 		err := tshelper.DeployOperatorSubscription(
+			"ovms-operator",
 			"ovms-operator",
 			"alpha",
 			randomNamespace,
@@ -242,6 +245,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 		By(fmt.Sprintf("Deploy nginx-ingress-operator%s for testing", "."+version))
 		// nginx-ingress-operator: in certified-operators group and version is certified
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.CertifiedOperatorPrefixNginx,
 			tsparams.CertifiedOperatorPrefixNginx,
 			channel,
 			randomNamespace,
@@ -269,6 +273,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 
 		By("Deploy anchore-engine operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.OperatorPrefixAnchore,
 			tsparams.OperatorPrefixAnchore,
 			"alpha",
 			randomNamespace,
@@ -316,6 +321,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 	It("two operators, one not installed with OLM [negative]", func() {
 		By("Deploy openvino operator for testing")
 		err := tshelper.DeployOperatorSubscription(
+			"ovms-operator",
 			"ovms-operator",
 			"alpha",
 			randomNamespace,
@@ -334,6 +340,7 @@ var _ = Describe("Operator install-source,", Serial, func() {
 
 		By("Deploy anchore-engine operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			tsparams.OperatorPrefixAnchore,
 			tsparams.OperatorPrefixAnchore,
 			"alpha",
 			randomNamespace,

diff --git a/tests/operator/tests/operator_install_status.go b/tests/operator/tests/operator_install_status.go
@@ -37,6 +37,7 @@ var _ = Describe("Operator install-source,", func() {
 
 		By("Deploy cloudbees-ci operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"cloudbees-ci",
 			"cloudbees-ci",
 			"alpha",
 			randomNamespace,
@@ -89,6 +90,7 @@ var _ = Describe("Operator install-source,", func() {
 		// The OpenVINO operator fails quickly due to the fact that it does not support the install mode type
 		// that it is used (OwnNamespace).
 		err := tshelper.DeployOperatorSubscription(
+			"ovms-operator",
 			"ovms-operator",
 			"alpha",
 			randomNamespace,

diff --git a/tests/operator/tests/operator_install_status_no_privileges.go b/tests/operator/tests/operator_install_status_no_privileges.go
@@ -38,6 +38,7 @@ var _ = Describe("Operator install-status-no-privileges,", func() {
 		// cloudbees operator has clusterPermissions but no resourceNames
 		By("Deploy cloudbees-ci operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"cloudbees-ci",
 			"cloudbees-ci",
 			"alpha",
 			randomNamespace,
@@ -57,6 +58,7 @@ var _ = Describe("Operator install-status-no-privileges,", func() {
 		// quay operator has no clusterPermissions
 		By("Deploy quay operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"project-quay",
 			"project-quay",
 			"stable-3.11",
 			randomNamespace,
@@ -76,6 +78,7 @@ var _ = Describe("Operator install-status-no-privileges,", func() {
 		// kiali operator has resourceNames under its rules
 		By("Deploy kiali operator for testing")
 		err = tshelper.DeployOperatorSubscription(
+			"kiali",
 			"kiali",
 			"alpha",
 			randomNamespace,