make plugin e2e tests skippable

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

staging/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_csv_labeler.go

@@ -5,11 +5,13 @@ import (
 	"fmt"
 
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/plugins"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
 	"github.com/sirupsen/logrus"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
+const CsvLabelerPluginId plugins.PluginID = "csv-labeler-plugin"
 const labelSyncerLabelKey = ""
 
 func NewCSVLabelSyncerLabeler(client operatorclient.ClientInterface, logger *logrus.Logger) *CSVLabelSyncerLabeler {

staging/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_plugins.go

@@ -5,9 +5,14 @@ import (
 )
 
 func init() {
-	operatorPlugInFactoryFuncs = []plugins.OperatorPlugInFactoryFunc{
+	operatorPlugInFactoryFuncs = plugins.OperatorPlugInFactoryMap{
 		// labels unlabeled non-payload openshift-* csv namespaces with
 		// security.openshift.io/scc.podSecurityLabelSync: true
-		plugins.NewCsvNamespaceLabelerPluginFunc,
+		CsvLabelerPluginId: plugins.NewCsvNamespaceLabelerPluginFunc,
 	}
 }
+
+func IsPluginEnabled(pluginID plugins.PluginID) bool {
+	_, ok := operatorPlugInFactoryFuncs[pluginID]
+	return ok
+}

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator.go

@@ -64,7 +64,7 @@ var (
 
 // this unexported operator plugin slice provides an entrypoint for
 // downstream to inject its own plugins to augment the controller behavior
-var operatorPlugInFactoryFuncs []plugins.OperatorPlugInFactoryFunc
+var operatorPlugInFactoryFuncs plugins.OperatorPlugInFactoryMap
 
 type Operator struct {
 	queueinformer.Operator

staging/operator-lifecycle-manager/pkg/controller/operators/olm/plugins/operator_plugin.go

@@ -10,6 +10,9 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
+type PluginID string
+type OperatorPlugInFactoryMap map[PluginID]OperatorPlugInFactoryFunc
+
 // HostOperator is an extensible and observable operator that hosts the plug-in, i.e. which the plug-in is extending
 type HostOperator interface {
 	queueinformer.ObservableOperator

staging/operator-lifecycle-manager/test/e2e/downstream_csv_namespace_labeler_plugin_test.go

@@ -7,6 +7,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/plugins"
 	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
 	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/util"
@@ -31,6 +32,10 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
 	})
 
 	It("should not label non openshift- namespaces", func() {
+		if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
+			Skip("csv labeler plugin is disabled")
+		}
+
 		// create namespace with operator group
 		testNamespace = SetupGeneratedTestNamespace(genName("csv-ns-labeler-"))
 
@@ -46,6 +51,10 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
 	})
 
 	It("should label a non-payload openshift- namespace", func() {
+		if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
+			Skip("csv labeler plugin is disabled")
+		}
+
 		// create namespace with operator group
 		testNamespace = SetupGeneratedTestNamespace(genName("openshift-csv-ns-labeler-"))
 
@@ -61,6 +70,10 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
 	})
 
 	It("should relabel a non-payload openshift- namespace containing csvs if the label is deleted", func() {
+		if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
+			Skip("csv labeler plugin is disabled")
+		}
+
 		// create namespace with operator group
 		testNamespace = SetupGeneratedTestNamespace(genName("openshift-csv-ns-labeler-"))