Skip to content

Commit caaf289

Browse files
exdxperdasilva
authored andcommitted
Remove operatorgroup queueinformer (#2753)
Removes the unneccesary operatorgroup queueinformer, since only an operatorgroup lister is needed. Also ensures that the syncResolvingNamespace function is no longer triggered by operatorgroup events. Signed-off-by: Daniel Sover <[email protected]> Upstream-repository: operator-lifecycle-manager Upstream-commit: dc7b00b05d9575f17c969c97f5b47475348068fd
1 parent b5b3a04 commit caaf289

File tree

2 files changed

+2
-26
lines changed
  • staging/operator-lifecycle-manager/pkg/controller/operators/catalog
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog

2 files changed

+2
-26
lines changed

staging/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -259,19 +259,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo
259259

260260
operatorGroupInformer := crInformerFactory.Operators().V1().OperatorGroups()
261261
op.lister.OperatorsV1().RegisterOperatorGroupLister(metav1.NamespaceAll, operatorGroupInformer.Lister())
262-
ogQueue := workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "ogs")
263-
op.ogQueueSet.Set(metav1.NamespaceAll, ogQueue)
264-
operatorGroupQueueInformer, err := queueinformer.NewQueueInformer(
265-
ctx,
266-
queueinformer.WithLogger(op.logger),
267-
queueinformer.WithQueue(ogQueue),
268-
queueinformer.WithInformer(operatorGroupInformer.Informer()),
269-
queueinformer.WithSyncer(queueinformer.LegacySyncHandler(op.syncResolvingNamespace).ToSyncer()),
270-
)
271-
if err != nil {
272-
return nil, err
273-
}
274-
if err := op.RegisterQueueInformer(operatorGroupQueueInformer); err != nil {
262+
if err := op.RegisterInformer(operatorGroupInformer.Informer()); err != nil {
275263
return nil, err
276264
}
277265

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/catalog/operator.go

Lines changed: 1 addition & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)