souce_provider: remove global namespace check

Remove the check for when the current namespace is the global namespace
and add an additional log in case of error.

Author: exdx

pkg/controller/operators/catalog/og_source_provider.go

@@ -12,19 +12,17 @@ import (
 )
 
 type OperatorGroupToggleSourceProvider struct {
-	sp              SourceProviderWithInvalidate
-	logger          *logrus.Logger
-	ogLister        v1listers.OperatorGroupLister
-	globalNamespace string
+	sp       SourceProviderWithInvalidate
+	logger   *logrus.Logger
+	ogLister v1listers.OperatorGroupLister
 }
 
 func NewOperatorGroupToggleSourceProvider(sp SourceProviderWithInvalidate, logger *logrus.Logger,
-	ogLister v1listers.OperatorGroupLister, globalNamespace string) *OperatorGroupToggleSourceProvider {
+	ogLister v1listers.OperatorGroupLister) *OperatorGroupToggleSourceProvider {
 	return &OperatorGroupToggleSourceProvider{
-		sp:              sp,
-		logger:          logger,
-		ogLister:        ogLister,
-		globalNamespace: globalNamespace,
+		sp:       sp,
+		logger:   logger,
+		ogLister: ogLister,
 	}
 }
 
@@ -40,6 +38,7 @@ func (e *OperatorGroupToggleSourceProvider) Sources(namespaces ...string) map[ca
 	// Check if annotation is set first
 	resolutionNamespaces, err := e.CheckForExclusion(namespaces...)
 	if err != nil {
+		e.logger.Errorf("error checking namespaces %#v for global resolution exlusion: %s", namespaces, err)
 		// Fail early with a dummy Source that returns an error
 		// Note: this only errors in the case the Lister fails, which should not happen
 		// TODO: Update the Sources interface to return an error
@@ -70,17 +69,10 @@ func (e *OperatorGroupToggleSourceProvider) CheckForExclusion(namespaces ...stri
 	var ownNamespace = namespaces[0]
 	var toggledResult = []string{ownNamespace}
 
-	if ownNamespace == e.globalNamespace {
-		// Global namespace is being synced
-		// Return early with default
-		return defaultResult, nil
-	}
-
 	// Check the OG on the NS provided for the exclusion annotation
 	ogs, err := e.ogLister.OperatorGroups(ownNamespace).List(labels.Everything())
 	if err != nil {
-		// Assume resolution was global in the case of an error (the default behavior)
-		return defaultResult, fmt.Errorf("listing operatorgroups in namespace %s: %s", ownNamespace, err)
+		return nil, fmt.Errorf("listing operatorgroups in namespace %s: %s", ownNamespace, err)
 	}
 
 	if len(ogs) != 1 || ogs[0] == nil {

pkg/controller/operators/catalog/operator.go

@@ -193,7 +193,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
 	}
 	op.sources = grpc.NewSourceStore(logger, 10*time.Second, 10*time.Minute, op.syncSourceState)
 	op.resolverSourceProvider = NewOperatorGroupToggleSourceProvider(resolver.SourceProviderFromRegistryClientProvider(op.sources, logger),
-		logger, op.lister.OperatorsV1().OperatorGroupLister(), operatorNamespace)
+		logger, op.lister.OperatorsV1().OperatorGroupLister())
 	op.reconciler = reconciler.NewRegistryReconcilerFactory(lister, opClient, configmapRegistryImage, op.now, ssaClient)
 	res := resolver.NewOperatorStepResolver(lister, crClient, operatorNamespace, op.resolverSourceProvider, logger)
 	op.resolver = resolver.NewInstrumentedResolver(res, metrics.RegisterDependencyResolutionSuccess, metrics.RegisterDependencyResolutionFailure)