Removes global filters option

Author: perdasilva

pkg/controller/registry/resolver/cache/cache.go

@@ -76,14 +76,13 @@ type OperatorCacheProvider interface {
 }
 
 type Cache struct {
-	logger        logrus.StdLogger
-	sp            SourceProvider
-	catsrcLister  v1alpha1.CatalogSourceLister
-	snapshots     map[SourceKey]*snapshotHeader
-	ttl           time.Duration
-	sem           chan struct{}
-	m             sync.RWMutex
-	globalFilters []Predicate
+	logger       logrus.StdLogger
+	sp           SourceProvider
+	catsrcLister v1alpha1.CatalogSourceLister
+	snapshots    map[SourceKey]*snapshotHeader
+	ttl          time.Duration
+	sem          chan struct{}
+	m            sync.RWMutex
 }
 
 type catalogSourcePriority int
@@ -104,12 +103,6 @@ func WithCatalogSourceLister(catalogSourceLister v1alpha1.CatalogSourceLister) O
 	}
 }
 
-func WithGlobalFilters(globalFilters ...Predicate) Option {
-	return func(c *Cache) {
-		c.globalFilters = globalFilters
-	}
-}
-
 func New(sp SourceProvider, options ...Option) *Cache {
 	const (
 		MaxConcurrentSnapshotUpdates = 4
@@ -121,12 +114,11 @@ func New(sp SourceProvider, options ...Option) *Cache {
 			logger.SetOutput(io.Discard)
 			return logger
 		}(),
-		sp:            sp,
-		catsrcLister:  operatorlister.NewLister().OperatorsV1alpha1().CatalogSourceLister(),
-		snapshots:     make(map[SourceKey]*snapshotHeader),
-		ttl:           5 * time.Minute,
-		sem:           make(chan struct{}, MaxConcurrentSnapshotUpdates),
-		globalFilters: make([]Predicate, 0),
+		sp:           sp,
+		catsrcLister: operatorlister.NewLister().OperatorsV1alpha1().CatalogSourceLister(),
+		snapshots:    make(map[SourceKey]*snapshotHeader),
+		ttl:          5 * time.Minute,
+		sem:          make(chan struct{}, MaxConcurrentSnapshotUpdates),
 	}
 
 	for _, opt := range options {
@@ -137,9 +129,8 @@ func New(sp SourceProvider, options ...Option) *Cache {
 }
 
 type NamespacedOperatorCache struct {
-	existing      *SourceKey
-	snapshots     map[SourceKey]*snapshotHeader
-	globalFilters []Predicate
+	existing  *SourceKey
+	snapshots map[SourceKey]*snapshotHeader
 }
 
 func (c *NamespacedOperatorCache) Error() error {
@@ -174,8 +165,7 @@ func (c *Cache) Namespaced(namespaces ...string) MultiCatalogOperatorFinder {
 	sources := c.sp.Sources(namespaces...)
 
 	result := NamespacedOperatorCache{
-		snapshots:     make(map[SourceKey]*snapshotHeader),
-		globalFilters: c.globalFilters,
+		snapshots: make(map[SourceKey]*snapshotHeader),
 	}
 
 	var misses []SourceKey
@@ -277,10 +267,6 @@ func (c *NamespacedOperatorCache) FindPreferred(preferred *SourceKey, preferredN
 		preferred = nil
 	}
 
-	if c.globalFilters != nil {
-		p = append(p, c.globalFilters...)
-	}
-
 	sorted := newSortableSnapshots(c.existing, preferred, preferredNamespace, c.snapshots)
 	sort.Sort(sorted)
 	for _, snapshot := range sorted.snapshots {

pkg/controller/registry/resolver/resolver.go

@@ -7,8 +7,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/runtime_constraints"
-
 	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -17,15 +15,12 @@ import (
 	v1alpha1listers "github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/listers/operators/v1alpha1"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/projection"
+	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/runtime_constraints"
 	"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/solver"
 	"github.com/operator-framework/operator-registry/pkg/api"
 	opregistry "github.com/operator-framework/operator-registry/pkg/registry"
 )
 
-const (
-	runtimeConstraintsFilePath = "runtime_constraints.json"
-)
-
 type OperatorResolver interface {
 	SolveOperators(csvs []*v1alpha1.ClusterServiceVersion, subs []*v1alpha1.Subscription, add map[cache.OperatorSourceInfo]struct{}) (cache.OperatorSet, error)
 }
@@ -45,16 +40,10 @@ func NewDefaultSatResolver(rcp cache.SourceProvider, catsrcLister v1alpha1lister
 		logger.Info("Cluster runtime constraints are in effect")
 	}
 
-	// Two solutions:
-	// #1: Global cache filters
-	// globalFilters := cache.WithGlobalFilters(runtimeConstraintProvider.Constraints()...)
-
 	return &SatResolver{
-		cache: cache.New(rcp, cache.WithLogger(logger), cache.WithCatalogSourceLister(catsrcLister) /*, globalFilters*/),
-		log:   logger,
-		// #2: apply constraints in addInvariants
-		runtimeConstraintsProvider: runtimeConstraintProvider, // uncomment when using option #2
-		// runtimeConstraintsProvider: nil                     // uncomment when using option #1
+		cache:                      cache.New(rcp, cache.WithLogger(logger), cache.WithCatalogSourceLister(catsrcLister)),
+		log:                        logger,
+		runtimeConstraintsProvider: runtimeConstraintProvider,
 	}
 }