feat(resolver): filtering deprecated bundles in resolver

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 9a58660d0570deaee0bb7ca5dae9aea4a97ae5f5

Author: gallettilance

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/cache.go

@@ -416,6 +416,17 @@ func WithPackage(pkg string) OperatorPredicate {
 	}
 }
 
+func WithoutDeprecatedProperty() OperatorPredicate {
+	return func(o *Operator) bool {
+		for _, p := range o.bundle.GetProperties() {
+			if p.GetType() == string(opregistry.DeprecatedType) {
+				return false
+			}
+		}
+		return true
+	}
+}
+
 func WithVersionInRange(r semver.Range) OperatorPredicate {
 	return func(o *Operator) bool {
 		return o.version != nil && r(*o.version)

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/resolver.go

@@ -73,6 +73,8 @@ func (r *SatResolver) SolveOperators(namespaces []string, csvs []*v1alpha1.Clust
 			predicates = append(predicates, WithChannel(sub.Spec.Channel))
 		}
 
+		predicates = append(predicates, WithoutDeprecatedProperty())
+
 		// find the currently installed operator (if it exists)
 		var current *Operator
 		for _, csv := range csvs {
@@ -297,6 +299,7 @@ func (r *SatResolver) getBundleInstallables(catalog registry.CatalogKey, predica
 			errs = append(errs, err)
 			continue
 		}
+		dependencyPredicates = append(dependencyPredicates, WithoutDeprecatedProperty())
 		for _, d := range dependencyPredicates {
 			// errors ignored; this will build an empty/unsatisfiable dependency if no candidates are found
 			candidateBundles, _ := AtLeast(1, namespacedCache.FindPreferred(&bundle.sourceInfo.Catalog, d))