From 24fb18886b6a1d0e27911cd3001305a6afe35ed1 Mon Sep 17 00:00:00 2001 From: Mikalai Radchuk Date: Fri, 25 Feb 2022 11:24:59 +0000 Subject: [PATCH] Cleans up unused args in `muo.NewReconciler` --- cmd/aro/operator.go | 4 +--- pkg/operator/controllers/muo/muo_controller.go | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/cmd/aro/operator.go b/cmd/aro/operator.go index 3eb3dc6cf88..8fdd2060b52 100644 --- a/cmd/aro/operator.go +++ b/cmd/aro/operator.go @@ -203,9 +203,7 @@ func operator(ctx context.Context, log *logrus.Entry) error { arocli, maocli, kubernetescli, imageregistrycli)).SetupWithManager(mgr); err != nil { return fmt.Errorf("unable to create controller %s: %v", controllers.StorageAccountsControllerName, err) } - if err = (muo.NewReconciler( - log.WithField("controller", controllers.ManagedUpgradeOperatorControllerName), - arocli, kubernetescli, dh)).SetupWithManager(mgr); err != nil { + if err = (muo.NewReconciler(arocli, kubernetescli, dh)).SetupWithManager(mgr); err != nil { return fmt.Errorf("unable to create controller %s: %v", controllers.ManagedUpgradeOperatorControllerName, err) } } diff --git a/pkg/operator/controllers/muo/muo_controller.go b/pkg/operator/controllers/muo/muo_controller.go index b8ab2b82ae9..5ed19c3963f 100644 --- a/pkg/operator/controllers/muo/muo_controller.go +++ b/pkg/operator/controllers/muo/muo_controller.go @@ -9,7 +9,6 @@ import ( "strings" "time" - "github.com/sirupsen/logrus" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes" @@ -39,7 +38,7 @@ type Reconciler struct { readinessTimeout time.Duration } -func NewReconciler(log *logrus.Entry, arocli aroclient.Interface, kubernetescli kubernetes.Interface, dh dynamichelper.Interface) *Reconciler { +func NewReconciler(arocli aroclient.Interface, kubernetescli kubernetes.Interface, dh dynamichelper.Interface) *Reconciler { return &Reconciler{ arocli: arocli, deployer: newDeployer(kubernetescli, dh),