Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-4.6] Bug 1938369: fix(resolver): Allow skipped versions to be installed initially #2040

Merged
merged 1 commit into from
Mar 17, 2021
Merged

[release-4.6] Bug 1938369: fix(resolver): Allow skipped versions to be installed initially #2040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/controller/registry/resolver/resolver.go
View file
Open in desktop
Expand Up @@ -97,6 +97,7 @@ func (r *SatResolver) SolveOperators(namespaces []string, csvs []*v1alpha1.Clust

// if no operator is installed and we have a startingCSV, filter for it
if current == nil && len(sub.Spec.StartingCSV) > 0 {
predicates = append(predicates, WithCSVName(sub.Spec.StartingCSV))
channelFilter = append(channelFilter, WithCSVName(sub.Spec.StartingCSV))
startingCSVs[sub.Spec.StartingCSV] = struct{}{}
}
Expand Down
52 changes: 47 additions & 5 deletions pkg/controller/registry/resolver/resolver_test.go
View file
Open in desktop
Expand Up @@ -1354,14 +1354,14 @@ func TestSolveOperators_WithoutDeprecated(t *testing.T) {
assert.IsType(t, solver.NotSatisfiable{}, err)
}

func TestSolveOperators_WithSkips(t *testing.T) {
func TestSolveOperators_WithSkipsAndStartingCSV(t *testing.T) {
APISet := APISet{opregistry.APIKey{"g", "v", "k", "ks"}: struct{}{}}
Provides := APISet

namespace := "olm"
catalog := registry.CatalogKey{"community", namespace}

newSub := newSub(namespace, "packageB", "alpha", catalog)
newSub := newSub(namespace, "packageB", "alpha", catalog, withStartingCSV("packageB.v1"))
subs := []*v1alpha1.Subscription{newSub}

opToAddVersionDeps := []*api.Dependency{
Expand All @@ -1372,6 +1372,8 @@ func TestSolveOperators_WithSkips(t *testing.T) {
}

opB := genOperator("packageB.v1", "1.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, opToAddVersionDeps, "", false)
opB2 := genOperator("packageB.v2", "2.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, opToAddVersionDeps, "", false)
opB2.skips = []string{"packageB.v1"}
op1 := genOperator("packageA.v1", "1.0.0", "", "packageA", "alpha", "community", "olm", nil, Provides, nil, "", false)
op2 := genOperator("packageA.v2", "2.0.0", "packageA.v1", "packageA", "alpha", "community", "olm", nil, Provides, nil, "", false)
op3 := genOperator("packageA.v3", "3.0.0", "packageA.v2", "packageA", "alpha", "community", "olm", nil, Provides, nil, "", false)
Expand All @@ -1392,7 +1394,7 @@ func TestSolveOperators_WithSkips(t *testing.T) {
Name: "community",
},
operators: []*Operator{
opB, op1, op2, op3, op4, op5, op6,
opB, opB2, op1, op2, op3, op4, op5, op6,
},
},
},
Expand All @@ -1404,10 +1406,50 @@ func TestSolveOperators_WithSkips(t *testing.T) {

operators, err := satResolver.SolveOperators([]string{"olm"}, nil, subs)
assert.NoError(t, err)
opB.SourceInfo().StartingCSV = "packageB.v1"
expected := OperatorSet{
"packageB.v1": opB,
"packageA.v6": op6,
}
require.EqualValues(t, expected, operators)
}

func TestSolveOperators_WithSkips(t *testing.T) {
namespace := "olm"
catalog := registry.CatalogKey{"community", namespace}

newSub := newSub(namespace, "packageB", "alpha", catalog)
subs := []*v1alpha1.Subscription{newSub}

opB := genOperator("packageB.v1", "1.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, nil, "", false)
opB2 := genOperator("packageB.v2", "2.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, nil, "", false)
opB2.skips = []string{"packageB.v1"}

fakeNamespacedOperatorCache := NamespacedOperatorCache{
snapshots: map[registry.CatalogKey]*CatalogSnapshot{
registry.CatalogKey{
Namespace: "olm",
Name: "community",
}: {
key: registry.CatalogKey{
Namespace: "olm",
Name: "community",
},
operators: []*Operator{
opB, opB2,
},
},
},
}
satResolver := SatResolver{
cache: getFakeOperatorCache(fakeNamespacedOperatorCache),
log: logrus.New(),
}

operators, err := satResolver.SolveOperators([]string{"olm"}, nil, subs)
assert.NoError(t, err)
expected := OperatorSet{
"packageB.v1": genOperator("packageB.v1", "1.0.0", "", "packageB", "alpha", "community", "olm", nil, nil, opToAddVersionDeps, "", false),
"packageA.v6": genOperator("packageA.v6", "6.0.0", "packageA.v5", "packageA", "alpha", "community", "olm", nil, Provides, nil, "", false),
"packageB.v2": opB2,
}
require.EqualValues(t, expected, operators)
}