From 6aba164d2d20ea2a3c2d4f1074f1ddb643565477 Mon Sep 17 00:00:00 2001 From: Daniel Franz Date: Mon, 8 Jan 2024 12:20:19 -0800 Subject: [PATCH] Fix snapshot failure when catalogSourceNamespace does not contain OperatorGroup. (#3149) Signed-off-by: Daniel Franz Upstream-repository: operator-lifecycle-manager Upstream-commit: 8eb16f7a9e12be729e07207983d27af78c23695b --- .../pkg/controller/operators/catalog/operator.go | 2 +- .../pkg/controller/operators/catalog/operator.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go index 2b0e3d592e..78d060976a 100644 --- a/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go +++ b/staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go @@ -346,7 +346,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo subscription.WithAppendedReconcilers(subscription.ReconcilerFromLegacySyncHandler(op.syncSubscriptions, nil)), subscription.WithRegistryReconcilerFactory(op.reconciler), subscription.WithGlobalCatalogNamespace(op.namespace), - subscription.WithSourceProvider(resolverSourceProvider), + subscription.WithSourceProvider(op.sourceInvalidator), ) if err != nil { return nil, err diff --git a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go index 2b0e3d592e..78d060976a 100644 --- a/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go +++ b/vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go @@ -346,7 +346,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo subscription.WithAppendedReconcilers(subscription.ReconcilerFromLegacySyncHandler(op.syncSubscriptions, nil)), subscription.WithRegistryReconcilerFactory(op.reconciler), subscription.WithGlobalCatalogNamespace(op.namespace), - subscription.WithSourceProvider(resolverSourceProvider), + subscription.WithSourceProvider(op.sourceInvalidator), ) if err != nil { return nil, err