Vendor registry 1.13.6 and fix unit test

1. Vendor the newest release of registry to avoid conflict with
another PR that may get merged first.
2. Fix unit test

Signed-off-by: Vu Dinh <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: 1ca55ffd4be0820efabe6af44e8f639681c92ad4

Author: dinhxuanvu

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

@@ -371,6 +371,9 @@ type OperatorPredicate func(*Operator) bool
 func (s *CatalogSnapshot) Find(p ...OperatorPredicate) []*Operator {
 	s.m.RLock()
 	defer s.m.RUnlock()
+	if len(p) > 0 {
+		p = append(p, WithoutDeprecatedProperty())
+	}
 	return Filter(s.operators, p...)
 }
 

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

@@ -314,7 +314,7 @@ func TestStripPluralRequiredAndProvidedAPIKeys(t *testing.T) {
 						Kind:    "K",
 						Plural:  "ks",
 					}: {},
-				}, nil),
+				}, nil, false),
 				Dependencies: apiSetToDependencies(map[opregistry.APIKey]struct{}{
 					{
 						Group:   "g2",

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

@@ -73,8 +73,6 @@ 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 {
@@ -299,7 +297,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))

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

@@ -47,6 +47,7 @@ func TestSolveOperators(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -92,6 +93,7 @@ func TestSolveOperators_MultipleChannels(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -140,6 +142,7 @@ func TestSolveOperators_FindLatestVersion(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -287,6 +290,7 @@ func TestSolveOperators_FindLatestVersionWithNestedDependencies(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -346,6 +350,7 @@ func TestSolveOperators_WithDependencies(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -403,6 +408,7 @@ func TestSolveOperators_WithGVKDependencies(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -440,7 +446,7 @@ func TestSolveOperators_WithLabelDependencies(t *testing.T) {
 		},
 	}
 
-	operatorBv1 := genOperator("packageB.v1", "1.0.0", "", "packageB", "beta", "community", "olm", nil, nil, nil, "")
+	operatorBv1 := genOperator("packageB.v1", "1.0.0", "", "packageB", "beta", "community", "olm", nil, nil, nil, "", false)
 	for _, p := range props {
 		operatorBv1.properties = append(operatorBv1.properties, p)
 	}
@@ -456,7 +462,7 @@ func TestSolveOperators_WithLabelDependencies(t *testing.T) {
 					Name:      "community",
 				},
 				operators: []*Operator{
-					genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, ""),
+					genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, "", false),
 					operatorBv1,
 				},
 			},
@@ -471,7 +477,7 @@ func TestSolveOperators_WithLabelDependencies(t *testing.T) {
 	assert.Equal(t, 2, len(operators))
 
 	expected := OperatorSet{
-		"packageA":    genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, ""),
+		"packageA":    genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, "", false),
 		"packageB.v1": operatorBv1,
 	}
 	for k := range expected {
@@ -505,8 +511,8 @@ func TestSolveOperators_WithUnsatisfiableLabelDependencies(t *testing.T) {
 					Name:      "community",
 				},
 				operators: []*Operator{
-					genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, ""),
-					genOperator("packageB.v1", "1.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, nil, ""),
+					genOperator("packageA", "0.0.1", "", "packageA", "alpha", "community", "olm", nil, nil, deps, "", false),
+					genOperator("packageB.v1", "1.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, nil, "", false),
 				},
 			},
 		},
@@ -668,6 +674,7 @@ func TestSolveOperators_IgnoreUnsatisfiableDependencies(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)
@@ -717,6 +724,7 @@ func TestSolveOperators_PreferCatalogInSameNamespace(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{namespace}, csvs, subs)
@@ -755,6 +763,7 @@ func TestSolveOperators_ResolveOnlyInCachedNamespaces(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{namespace}, csvs, subs)
@@ -792,6 +801,7 @@ func TestSolveOperators_PreferDefaultChannelInResolution(t *testing.T) {
 
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{namespace}, csvs, subs)
@@ -832,6 +842,7 @@ func TestSolveOperators_PreferDefaultChannelInResolutionForTransitiveDependencie
 
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{namespace}, csvs, subs)
@@ -1176,6 +1187,7 @@ func TestSolveOperators_WithoutDeprecated(t *testing.T) {
 	}
 	satResolver := SatResolver{
 		cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
+		log:   logrus.New(),
 	}
 
 	operators, err := satResolver.SolveOperators([]string{"olm"}, csvs, subs)

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

@@ -4,11 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
 	"strings"
 	"sync"
 	"time"
 
+	"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
+
 	"github.com/blang/semver"
 	. "github.com/onsi/ginkgo"
 	"github.com/onsi/ginkgo/extensions/table"