Merge pull request #272 from samira-barouti/deploy-catalogsource

Deploy catalogsource resource in the custom namespace
redhat-openshift-ecosystem · Sep 23, 2021 · 1b67d3f · 1b67d3f
2 parents 9542c69 + e67a34b
commit 1b67d3f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/certification/internal/policy/operator/default.go b/certification/internal/policy/operator/default.go
@@ -1,9 +1,6 @@
 package operator
 
 const (
-	// catalogSourceNS is the namespace in which the CatalogSource CR is installed
-	catalogSourceNS = "openshift-marketplace"
-
 	// packageKey is the packageKey in annotations.yaml that contains the package name.
 	packageKey = "operators.operatorframework.io.bundle.package.v1"
 

diff --git a/certification/internal/policy/operator/deployable_by_olm.go b/certification/internal/policy/operator/deployable_by_olm.go
@@ -107,7 +107,7 @@ func (p *DeployableByOlmCheck) setUp(operatorData OperatorData) error {
 		return err
 	}
 
-	if _, err := p.OpenshiftEngine.CreateCatalogSource(cli.CatalogSourceData{Name: operatorData.App, Image: operatorData.CatalogImage}, cli.OpenshiftOptions{Namespace: catalogSourceNS}); err != nil && !kubeErr.IsAlreadyExists(err) {
+	if _, err := p.OpenshiftEngine.CreateCatalogSource(cli.CatalogSourceData{Name: operatorData.App, Image: operatorData.CatalogImage}, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace}); err != nil && !kubeErr.IsAlreadyExists(err) {
 		return err
 	}
 
@@ -120,7 +120,7 @@ func (p *DeployableByOlmCheck) setUp(operatorData OperatorData) error {
 		Name:                   operatorData.App,
 		Channel:                operatorData.Channel,
 		CatalogSource:          operatorData.App,
-		CatalogSourceNamespace: catalogSourceNS,
+		CatalogSourceNamespace: operatorData.InstallNamespace,
 		Package:                operatorData.PackageName,
 	}
 	if _, err := p.OpenshiftEngine.CreateSubscription(subscriptionData, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace}); err != nil && !kubeErr.IsAlreadyExists(err) {
@@ -231,7 +231,7 @@ func (p *DeployableByOlmCheck) cleanUp(operatorData OperatorData) {
 	}
 	p.writeToFile(subs, operatorData.App, "subscription")
 
-	cs, err := p.OpenshiftEngine.GetCatalogSource(operatorData.App, cli.OpenshiftOptions{Namespace: catalogSourceNS})
+	cs, err := p.OpenshiftEngine.GetCatalogSource(operatorData.App, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace})
 	if err != nil {
 		log.Error("unable to retrieve the catalogsource")
 	}
@@ -251,7 +251,7 @@ func (p *DeployableByOlmCheck) cleanUp(operatorData OperatorData) {
 
 	log.Trace("Deleting the resources created by Check")
 	p.OpenshiftEngine.DeleteSubscription(operatorData.App, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace})
-	p.OpenshiftEngine.DeleteCatalogSource(operatorData.App, cli.OpenshiftOptions{Namespace: catalogSourceNS})
+	p.OpenshiftEngine.DeleteCatalogSource(operatorData.App, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace})
 	p.OpenshiftEngine.DeleteOperatorGroup(operatorData.App, cli.OpenshiftOptions{Namespace: operatorData.InstallNamespace})
 	p.OpenshiftEngine.DeleteNamespace(operatorData.InstallNamespace, cli.OpenshiftOptions{})
 }