fix(resolver): take a snapshot of the current generation before updates

this prevents detecting two updates to the same operator during one
resolution

Author: ecordell

pkg/controller/registry/resolver/evolver.go

@@ -50,7 +50,8 @@ func (e *NamespaceGenerationEvolver) Evolve(add map[OperatorSourceInfo]struct{})
 }
 
 func (e *NamespaceGenerationEvolver) checkForUpdates() error {
-	for _, op := range e.gen.Operators() {
+	// take a snapshot of the current generation so that we don't update the same operator twice in one resolution
+	for _, op := range e.gen.Operators().Snapshot() {
 		// only check for updates if we have sourceinfo
 		if op.SourceInfo() == &ExistingOperator {
 			continue

pkg/controller/registry/resolver/evolver_test.go

@@ -373,6 +373,27 @@ func TestNamespaceGenerationEvolver(t *testing.T) {
 				NewFakeOperatorSurface("provider.v1", "provider", "channel", "", "catsrc", "", []opregistry.APIKey{{"g", "v", "k", "ks"}}, nil, nil, nil),
 			),
 		},
+		{
+			// an existing operator has multiple updates available
+			// a single evolution should update to next, not latest
+			name: "UpdateRequired/MultipleUpdates",
+			fields: fields{
+				querier: NewFakeSourceQuerier(map[CatalogKey][]*opregistry.Bundle{
+					CatalogKey{"catsrc", "catsrc-namespace"}: {
+						bundle("updated", "o", "c", "original", nil, nil, nil, nil),
+						bundle("updated.v2", "o", "c", "updated", nil, nil, nil, nil),
+						bundle("updated.v3", "o", "c", "updated.v2", nil, nil, nil, nil),
+					},
+				}),
+				gen: NewGenerationFromOperators(
+					NewFakeOperatorSurface("original", "o", "c", "", "catsrc", "", nil, nil, nil, nil),
+				),
+			},
+			args: args{},
+			wantGen: NewGenerationFromOperators(
+				NewFakeOperatorSurface("updated", "o", "c", "original", "catsrc", "", nil, nil, nil, nil),
+			),
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/controller/registry/resolver/operators.go

@@ -147,6 +147,15 @@ func EmptyOperatorSet() OperatorSet {
 	return map[string]OperatorSurface{}
 }
 
+// Snapshot returns a new set, pointing to the same values
+func (o OperatorSet) Snapshot() OperatorSet {
+	out := make(map[string]OperatorSurface)
+	for key, val := range o {
+		out[key] = val
+	}
+	return out
+}
+
 type APIMultiOwnerSet map[opregistry.APIKey]OperatorSet
 
 func EmptyAPIMultiOwnerSet() APIMultiOwnerSet {