From 8f989734ce9b637e6bbe07e8a0bb29becd26bf4e Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Sun, 15 Dec 2024 12:13:25 +0100 Subject: [PATCH] nerf to single worker Signed-off-by: Per Goncalves da Silva --- pkg/controller/operators/catalog/operator.go | 2 +- pkg/controller/operators/catalogtemplate/operator.go | 2 +- pkg/controller/operators/olm/operator.go | 2 +- pkg/lib/queueinformer/config.go | 2 +- pkg/package-server/provider/registry_test.go | 2 +- pkg/package-server/server/server.go | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/controller/operators/catalog/operator.go b/pkg/controller/operators/catalog/operator.go index ebdd6313a4..4fa544dcc4 100644 --- a/pkg/controller/operators/catalog/operator.go +++ b/pkg/controller/operators/catalog/operator.go @@ -168,7 +168,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, clock utilclock.Clo return nil, err } - queueOperator, err := queueinformer.NewOperator(opClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(logger)) + queueOperator, err := queueinformer.NewOperator(opClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(logger), queueinformer.WithNumWorkers(1)) if err != nil { return nil, err } diff --git a/pkg/controller/operators/catalogtemplate/operator.go b/pkg/controller/operators/catalogtemplate/operator.go index ea10454506..2e0211e0f6 100644 --- a/pkg/controller/operators/catalogtemplate/operator.go +++ b/pkg/controller/operators/catalogtemplate/operator.go @@ -69,7 +69,7 @@ func NewOperator(ctx context.Context, kubeconfigPath string, logger *logrus.Logg return nil, err } - queueOperator, err := queueinformer.NewOperator(opClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(logger)) + queueOperator, err := queueinformer.NewOperator(opClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(logger), queueinformer.WithNumWorkers(1)) if err != nil { return nil, err } diff --git a/pkg/controller/operators/olm/operator.go b/pkg/controller/operators/olm/operator.go index e6dfaaf1d0..fd3ff9035b 100644 --- a/pkg/controller/operators/olm/operator.go +++ b/pkg/controller/operators/olm/operator.go @@ -165,7 +165,7 @@ func newOperatorWithConfig(ctx context.Context, config *operatorConfig) (*Operat return nil, err } - queueOperator, err := queueinformer.NewOperator(config.operatorClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(config.logger)) + queueOperator, err := queueinformer.NewOperator(config.operatorClient.KubernetesInterface().Discovery(), queueinformer.WithOperatorLogger(config.logger), queueinformer.WithNumWorkers(1)) if err != nil { return nil, err } diff --git a/pkg/lib/queueinformer/config.go b/pkg/lib/queueinformer/config.go index bd69d2403b..022b1b89eb 100644 --- a/pkg/lib/queueinformer/config.go +++ b/pkg/lib/queueinformer/config.go @@ -233,6 +233,6 @@ func (c *operatorConfig) validate() (err error) { func defaultOperatorConfig() *operatorConfig { return &operatorConfig{ logger: logrus.New(), - numWorkers: 2, + numWorkers: 1, } } diff --git a/pkg/package-server/provider/registry_test.go b/pkg/package-server/provider/registry_test.go index 02b994ce95..e05d4d940f 100644 --- a/pkg/package-server/provider/registry_test.go +++ b/pkg/package-server/provider/registry_test.go @@ -91,7 +91,7 @@ func NewFakeRegistryProvider(ctx context.Context, clientObjs []runtime.Object, k k8sClientFake := k8sfake.NewSimpleClientset(k8sObjs...) opClientFake := operatorclient.NewClient(k8sClientFake, nil, nil) - op, err := queueinformer.NewOperator(opClientFake.KubernetesInterface().Discovery()) + op, err := queueinformer.NewOperator(opClientFake.KubernetesInterface().Discovery(), queueinformer.WithNumWorkers(1)) if err != nil { return nil, err } diff --git a/pkg/package-server/server/server.go b/pkg/package-server/server/server.go index 85ad4931dd..30ec39fa20 100644 --- a/pkg/package-server/server/server.go +++ b/pkg/package-server/server/server.go @@ -232,7 +232,7 @@ func (o *PackageServerOptions) Run(ctx context.Context) error { return err } - queueOperator, err := queueinformer.NewOperator(crClient.Discovery()) + queueOperator, err := queueinformer.NewOperator(crClient.Discovery(), queueinformer.WithNumWorkers(1)) if err != nil { return err }