From f9a0400477010f14bc8af6dfa94468edb6c887f4 Mon Sep 17 00:00:00 2001 From: Shafeeque E S Date: Tue, 20 Dec 2022 18:29:10 +0530 Subject: [PATCH] Use `Build()` function for all controllers --- .../controller/project/activity/add.go | 16 +++++++--------- .../controller/seed/backupbucketscheck/add.go | 17 ++++++++--------- .../controller/seed/extensionscheck/add.go | 17 ++++++++--------- pkg/gardenlet/controller/backupbucket/add.go | 16 +++++++--------- .../controller/backupentry/backupentry/add.go | 16 +++++++--------- .../controller/backupentry/migration/add.go | 16 +++++++--------- pkg/gardenlet/controller/bastion/add.go | 16 +++++++--------- .../controllerinstallation/care/add.go | 16 +++++++--------- .../controllerinstallation/add.go | 16 +++++++--------- .../controllerinstallation/required/add.go | 16 +++++++--------- pkg/gardenlet/controller/managedseed/add.go | 16 +++++++--------- pkg/gardenlet/controller/networkpolicy/add.go | 16 +++++++--------- pkg/gardenlet/controller/seed/care/add.go | 16 +++++++--------- pkg/gardenlet/controller/seed/lease/add.go | 19 ++++++++----------- pkg/gardenlet/controller/seed/seed/add.go | 16 +++++++--------- pkg/gardenlet/controller/shoot/care/add.go | 16 +++++++--------- .../controller/shoot/migration/add.go | 16 +++++++--------- pkg/gardenlet/controller/shoot/shoot/add.go | 16 +++++++--------- .../controller/shootstate/extensions/add.go | 16 +++++++--------- .../controller/csrapprover/add.go | 16 +++++++--------- .../controller/garbagecollector/add.go | 16 +++++++--------- .../controller/health/health/add.go | 16 +++++++--------- .../controller/health/progressing/add.go | 15 ++++++--------- .../controller/rootcapublisher/add.go | 16 +++++++--------- .../controller/tokeninvalidator/add.go | 16 +++++++--------- 25 files changed, 177 insertions(+), 227 deletions(-) diff --git a/pkg/controllermanager/controller/project/activity/add.go b/pkg/controllermanager/controller/project/activity/add.go index 27926925ce93..9211bb6b46f2 100644 --- a/pkg/controllermanager/controller/project/activity/add.go +++ b/pkg/controllermanager/controller/project/activity/add.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" @@ -51,16 +52,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/controllermanager/controller/seed/backupbucketscheck/add.go b/pkg/controllermanager/controller/seed/backupbucketscheck/add.go index bdea6efcd0a4..134bf031d82a 100644 --- a/pkg/controllermanager/controller/seed/backupbucketscheck/add.go +++ b/pkg/controllermanager/controller/seed/backupbucketscheck/add.go @@ -22,6 +22,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" @@ -46,18 +47,16 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), + // if going into exponential backoff, wait at most the configured sync period RateLimiter: workqueue.NewWithMaxWaitRateLimiter(workqueue.DefaultControllerRateLimiter(), r.Config.SyncPeriod.Duration), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/controllermanager/controller/seed/extensionscheck/add.go b/pkg/controllermanager/controller/seed/extensionscheck/add.go index 1e5b7bdfdcd0..5a263eead672 100644 --- a/pkg/controllermanager/controller/seed/extensionscheck/add.go +++ b/pkg/controllermanager/controller/seed/extensionscheck/add.go @@ -22,6 +22,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -45,18 +46,16 @@ func (r *Reconciler) AddToManager(mgr manager.Manager) error { r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), + // if going into exponential backoff, wait at most the configured sync period RateLimiter: workqueue.NewWithMaxWaitRateLimiter(workqueue.DefaultControllerRateLimiter(), r.Config.SyncPeriod.Duration), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/backupbucket/add.go b/pkg/gardenlet/controller/backupbucket/add.go index d0a83e8384bd..5dab6abca9e8 100644 --- a/pkg/gardenlet/controller/backupbucket/add.go +++ b/pkg/gardenlet/controller/backupbucket/add.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -58,18 +59,15 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.GardenNamespace = v1beta1constants.GardenNamespace } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), RateLimiter: r.RateLimiter, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/backupentry/backupentry/add.go b/pkg/gardenlet/controller/backupentry/backupentry/add.go index 0195a5ccac17..f3fcde7fc74d 100644 --- a/pkg/gardenlet/controller/backupentry/backupentry/add.go +++ b/pkg/gardenlet/controller/backupentry/backupentry/add.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -61,18 +62,15 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.GardenNamespace = v1beta1constants.GardenNamespace } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), RateLimiter: r.RateLimiter, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/backupentry/migration/add.go b/pkg/gardenlet/controller/backupentry/migration/add.go index 0f198af36103..95a93fd710c7 100644 --- a/pkg/gardenlet/controller/backupentry/migration/add.go +++ b/pkg/gardenlet/controller/backupentry/migration/add.go @@ -17,6 +17,7 @@ package migration import ( "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -41,16 +42,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/bastion/add.go b/pkg/gardenlet/controller/bastion/add.go index 6ec95a5b2524..206b39712ae3 100644 --- a/pkg/gardenlet/controller/bastion/add.go +++ b/pkg/gardenlet/controller/bastion/add.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -53,18 +54,15 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), RateLimiter: r.RateLimiter, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/controllerinstallation/care/add.go b/pkg/gardenlet/controller/controllerinstallation/care/add.go index 750c7e458bcc..3b8334a03526 100644 --- a/pkg/gardenlet/controller/controllerinstallation/care/add.go +++ b/pkg/gardenlet/controller/controllerinstallation/care/add.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -53,19 +54,16 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.GardenNamespace = v1beta1constants.GardenNamespace } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), // if going into exponential backoff, wait at most the configured sync period RateLimiter: workqueue.NewWithMaxWaitRateLimiter(workqueue.DefaultControllerRateLimiter(), r.Config.SyncPeriod.Duration), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/controllerinstallation/controllerinstallation/add.go b/pkg/gardenlet/controller/controllerinstallation/controllerinstallation/add.go index 79cb94ca0682..cb9d29a1de96 100644 --- a/pkg/gardenlet/controller/controllerinstallation/controllerinstallation/add.go +++ b/pkg/gardenlet/controller/controllerinstallation/controllerinstallation/add.go @@ -19,6 +19,7 @@ import ( "reflect" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -42,16 +43,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.GardenClient = gardenCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/controllerinstallation/required/add.go b/pkg/gardenlet/controller/controllerinstallation/required/add.go index 9f1af655ed3c..152c8de9c45b 100644 --- a/pkg/gardenlet/controller/controllerinstallation/required/add.go +++ b/pkg/gardenlet/controller/controllerinstallation/required/add.go @@ -24,6 +24,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -55,16 +56,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.Lock = &sync.RWMutex{} r.KindToRequiredTypes = make(map[string]sets.String) - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/managedseed/add.go b/pkg/gardenlet/controller/managedseed/add.go index bffe997e38d2..37563279afe8 100644 --- a/pkg/gardenlet/controller/managedseed/add.go +++ b/pkg/gardenlet/controller/managedseed/add.go @@ -21,6 +21,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -87,16 +88,13 @@ func (r *Reconciler) AddToManager( ) } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.Controllers.ManagedSeed.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/networkpolicy/add.go b/pkg/gardenlet/controller/networkpolicy/add.go index c6904a3a80ff..1eb1576897c1 100644 --- a/pkg/gardenlet/controller/networkpolicy/add.go +++ b/pkg/gardenlet/controller/networkpolicy/add.go @@ -23,6 +23,7 @@ import ( networkingv1 "k8s.io/api/networking/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -73,16 +74,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, seedCluster cluster.Clust r.IstioSystemNamespace = v1beta1constants.IstioSystemNamespace } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/seed/care/add.go b/pkg/gardenlet/controller/seed/care/add.go index 5967c545646e..803879b3ad06 100644 --- a/pkg/gardenlet/controller/seed/care/add.go +++ b/pkg/gardenlet/controller/seed/care/add.go @@ -20,6 +20,7 @@ import ( "github.com/go-logr/logr" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -50,19 +51,16 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.SeedClient = seedCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, // if going into exponential backoff, wait at most the configured sync period RateLimiter: workqueue.NewWithMaxWaitRateLimiter(workqueue.DefaultControllerRateLimiter(), r.Config.SyncPeriod.Duration), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/seed/lease/add.go b/pkg/gardenlet/controller/seed/lease/add.go index 940bb7c4616d..28244b82f170 100644 --- a/pkg/gardenlet/controller/seed/lease/add.go +++ b/pkg/gardenlet/controller/seed/lease/add.go @@ -19,6 +19,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/utils/clock" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -44,18 +45,14 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.LeaseNamespace = gardencorev1beta1.GardenerSeedLeaseNamespace } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, - - RateLimiter: workqueue.NewItemExponentialFailureRateLimiter(time.Millisecond, 2*time.Second), - }, - ) + RateLimiter: workqueue.NewItemExponentialFailureRateLimiter(time.Millisecond, 2*time.Second), + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/seed/seed/add.go b/pkg/gardenlet/controller/seed/seed/add.go index 26156b5a613c..f0ebe1cdf7be 100644 --- a/pkg/gardenlet/controller/seed/seed/add.go +++ b/pkg/gardenlet/controller/seed/seed/add.go @@ -18,6 +18,7 @@ import ( "fmt" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -58,16 +59,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.ClientCertificateExpirationTimestamp = &metav1.Time{Time: gardenletClientCertificate.Leaf.NotAfter} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/shoot/care/add.go b/pkg/gardenlet/controller/shoot/care/add.go index e2c95c6807a9..904d3f18589a 100644 --- a/pkg/gardenlet/controller/shoot/care/add.go +++ b/pkg/gardenlet/controller/shoot/care/add.go @@ -18,6 +18,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" @@ -42,19 +43,16 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.GardenClient = gardenCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.Controllers.ShootCare.ConcurrentSyncs, 0), // if going into exponential backoff, wait at most the configured sync period RateLimiter: workqueue.NewWithMaxWaitRateLimiter(workqueue.DefaultControllerRateLimiter(), r.Config.Controllers.ShootCare.SyncPeriod.Duration), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/shoot/migration/add.go b/pkg/gardenlet/controller/shoot/migration/add.go index ddeeb3bcb7d9..0b212c516589 100644 --- a/pkg/gardenlet/controller/shoot/migration/add.go +++ b/pkg/gardenlet/controller/shoot/migration/add.go @@ -17,6 +17,7 @@ package migration import ( "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -41,16 +42,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/shoot/shoot/add.go b/pkg/gardenlet/controller/shoot/shoot/add.go index eaa3922f097b..833b8cd6b5dc 100644 --- a/pkg/gardenlet/controller/shoot/shoot/add.go +++ b/pkg/gardenlet/controller/shoot/shoot/add.go @@ -20,6 +20,7 @@ import ( "k8s.io/client-go/util/workqueue" "k8s.io/utils/clock" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/event" @@ -50,16 +51,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster cluster.Clu r.Clock = clock.RealClock{} } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.Controllers.Shoot.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/gardenlet/controller/shootstate/extensions/add.go b/pkg/gardenlet/controller/shootstate/extensions/add.go index b652721140b5..83bda0fcfe65 100644 --- a/pkg/gardenlet/controller/shootstate/extensions/add.go +++ b/pkg/gardenlet/controller/shootstate/extensions/add.go @@ -20,6 +20,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -45,16 +46,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, gardenCluster, seedCluste r.SeedClient = seedCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - fmt.Sprintf("%s-%s", ControllerName, r.ObjectKind), - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(fmt.Sprintf("%s-%s", ControllerName, r.ObjectKind)). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/csrapprover/add.go b/pkg/resourcemanager/controller/csrapprover/add.go index 2d4c9438745b..57c819c418ab 100644 --- a/pkg/resourcemanager/controller/csrapprover/add.go +++ b/pkg/resourcemanager/controller/csrapprover/add.go @@ -17,6 +17,7 @@ package csrapprover import ( certificatesv1 "k8s.io/api/certificates/v1" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -40,16 +41,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, sourceCluster, targetClus r.TargetClient = targetCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/garbagecollector/add.go b/pkg/resourcemanager/controller/garbagecollector/add.go index 51315c0bd7b5..3289d7166d58 100644 --- a/pkg/resourcemanager/controller/garbagecollector/add.go +++ b/pkg/resourcemanager/controller/garbagecollector/add.go @@ -18,6 +18,7 @@ import ( "time" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/manager" @@ -40,16 +41,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, targetCluster cluster.Clu r.MinimumObjectLifetime = pointer.Duration(10 * time.Minute) } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/health/health/add.go b/pkg/resourcemanager/controller/health/health/add.go index 09699c82ffb2..5143e682ea1f 100644 --- a/pkg/resourcemanager/controller/health/health/add.go +++ b/pkg/resourcemanager/controller/health/health/add.go @@ -23,6 +23,7 @@ import ( "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "k8s.io/utils/pointer" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -54,16 +55,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, sourceCluster, targetClus r.TargetScheme = targetCluster.GetScheme() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/health/progressing/add.go b/pkg/resourcemanager/controller/health/progressing/add.go index 54fa002baa07..827fc8a622c2 100644 --- a/pkg/resourcemanager/controller/health/progressing/add.go +++ b/pkg/resourcemanager/controller/health/progressing/add.go @@ -43,16 +43,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, sourceCluster, targetClus r.TargetClient = targetCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: pointer.IntDeref(r.Config.ConcurrentSyncs, 0), - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/rootcapublisher/add.go b/pkg/resourcemanager/controller/rootcapublisher/add.go index 4622032c20fe..3499e548de54 100644 --- a/pkg/resourcemanager/controller/rootcapublisher/add.go +++ b/pkg/resourcemanager/controller/rootcapublisher/add.go @@ -20,6 +20,7 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -47,16 +48,13 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, targetCluster cluster.Clu r.RootCA = string(rootCA) } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, - }, - ) + }). + Build(r) if err != nil { return err } diff --git a/pkg/resourcemanager/controller/tokeninvalidator/add.go b/pkg/resourcemanager/controller/tokeninvalidator/add.go index ffbd69db7a81..112b855204af 100644 --- a/pkg/resourcemanager/controller/tokeninvalidator/add.go +++ b/pkg/resourcemanager/controller/tokeninvalidator/add.go @@ -22,6 +22,7 @@ import ( apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" + "sigs.k8s.io/controller-runtime/pkg/builder" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/cluster" "sigs.k8s.io/controller-runtime/pkg/controller" @@ -48,17 +49,14 @@ func (r *Reconciler) AddToManager(mgr manager.Manager, targetCluster cluster.Clu r.TargetClient = targetCluster.GetClient() } - // It's not possible to overwrite the event handler when using the controller builder. Hence, we have to build up - // the controller manually. - c, err := controller.New( - ControllerName, - mgr, - controller.Options{ - Reconciler: r, + c, err := builder. + ControllerManagedBy(mgr). + Named(ControllerName). + WithOptions(controller.Options{ MaxConcurrentReconciles: 1, RateLimiter: r.RateLimiter, - }, - ) + }). + Build(r) if err != nil { return err }