From 0299799fa99a6ea41137131dbff8056119e1aa9b Mon Sep 17 00:00:00 2001
From: Shafeeque E S <shafeeque.e.s@sap.com>
Date: Tue, 28 Mar 2023 14:56:37 +0530
Subject: [PATCH] Minor cosmetics and streamlining (#558)

---
 controllers/compaction/register.go          | 30 ++++++++++-----------
 controllers/custodian/register.go           | 13 ++++-----
 controllers/etcd/register.go                | 11 +++++---
 controllers/etcdcopybackupstask/register.go |  9 ++++---
 controllers/secret/register.go              | 10 +++----
 5 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/controllers/compaction/register.go b/controllers/compaction/register.go
index c8b2401b1..b2af8a33f 100644
--- a/controllers/compaction/register.go
+++ b/controllers/compaction/register.go
@@ -19,6 +19,7 @@ import (
 	druidpredicates "github.com/gardener/etcd-druid/pkg/predicate"
 	coordinationv1 "k8s.io/api/coordination/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
+	ctrlbuilder "sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/source"
@@ -28,19 +29,18 @@ const controllerName = "compaction-controller"
 
 // RegisterWithManager registers the Compaction Controller with the given controller manager.
 func (r *Reconciler) RegisterWithManager(mgr ctrl.Manager) error {
-	c, err := controller.New(controllerName, mgr, controller.Options{
-		Reconciler:              r,
-		MaxConcurrentReconciles: r.config.Workers,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	return c.Watch(
-		&source.Kind{Type: &coordinationv1.Lease{}},
-		&handler.EnqueueRequestForOwner{OwnerType: &druidv1alpha1.Etcd{}, IsController: true},
-		druidpredicates.LeaseHolderIdentityChange(),
-		druidpredicates.IsSnapshotLease(),
-	)
+	return ctrl.
+		NewControllerManagedBy(mgr).
+		Named(controllerName).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: r.config.Workers,
+		}).
+		Watches(
+			&source.Kind{Type: &coordinationv1.Lease{}},
+			&handler.EnqueueRequestForOwner{OwnerType: &druidv1alpha1.Etcd{}, IsController: true},
+			ctrlbuilder.WithPredicates(
+				druidpredicates.LeaseHolderIdentityChange(),
+				druidpredicates.IsSnapshotLease(),
+			)).
+		Complete(r)
 }
diff --git a/controllers/custodian/register.go b/controllers/custodian/register.go
index 96652e652..5ebcf0d73 100644
--- a/controllers/custodian/register.go
+++ b/controllers/custodian/register.go
@@ -34,15 +34,16 @@ const controllerName = "custodian-controller"
 
 // RegisterWithManager registers the Custodian Controller with the given controller manager.
 func (r *Reconciler) RegisterWithManager(ctx context.Context, mgr ctrl.Manager, ignoreOperationAnnotation bool) error {
-	builder := ctrl.NewControllerManagedBy(mgr).WithOptions(controller.Options{
-		MaxConcurrentReconciles: r.config.Workers,
-	})
-
-	c, err := builder.
+	c, err := ctrl.
+		NewControllerManagedBy(mgr).
 		Named(controllerName).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: r.config.Workers,
+		}).
 		For(
 			&druidv1alpha1.Etcd{},
-			ctrlbuilder.WithPredicates(druidpredicates.EtcdReconciliationFinished(ignoreOperationAnnotation))).
+			ctrlbuilder.WithPredicates(druidpredicates.EtcdReconciliationFinished(ignoreOperationAnnotation)),
+		).
 		Owns(&coordinationv1.Lease{}).
 		Build(r)
 	if err != nil {
diff --git a/controllers/etcd/register.go b/controllers/etcd/register.go
index 7ccc844b0..f9344bdc8 100644
--- a/controllers/etcd/register.go
+++ b/controllers/etcd/register.go
@@ -29,18 +29,21 @@ const controllerName = "etcd-controller"
 
 // RegisterWithManager registers the Etcd Controller with the given controller manager.
 func (r *Reconciler) RegisterWithManager(mgr ctrl.Manager, ignoreOperationAnnotation bool) error {
-	builder := ctrl.NewControllerManagedBy(mgr).WithOptions(controller.Options{
-		MaxConcurrentReconciles: r.config.Workers,
-	})
-	builder = builder.
+	builder := ctrl.
+		NewControllerManagedBy(mgr).
 		Named(controllerName).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: r.config.Workers,
+		}).
 		WithEventFilter(BuildPredicate(ignoreOperationAnnotation)).
 		For(&druidv1alpha1.Etcd{})
+
 	if ignoreOperationAnnotation {
 		builder = builder.Owns(&corev1.Service{}).
 			Owns(&corev1.ConfigMap{}).
 			Owns(&appsv1.StatefulSet{})
 	}
+
 	return builder.Complete(r)
 }
 
diff --git a/controllers/etcdcopybackupstask/register.go b/controllers/etcdcopybackupstask/register.go
index 331202b8e..30307ad12 100644
--- a/controllers/etcdcopybackupstask/register.go
+++ b/controllers/etcdcopybackupstask/register.go
@@ -19,7 +19,7 @@ import (
 
 	batchv1 "k8s.io/api/batch/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/builder"
+	ctrlbuilder "sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/controller"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 )
@@ -30,10 +30,13 @@ const controllerName = "etcdcopybackupstask-controller"
 func (r *Reconciler) RegisterWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).
 		Named(controllerName).
-		For(&druidv1alpha1.EtcdCopyBackupsTask{}, builder.WithPredicates(predicate.GenerationChangedPredicate{})).
-		Owns(&batchv1.Job{}).
 		WithOptions(controller.Options{
 			MaxConcurrentReconciles: r.Config.Workers,
 		}).
+		For(
+			&druidv1alpha1.EtcdCopyBackupsTask{},
+			ctrlbuilder.WithPredicates(predicate.GenerationChangedPredicate{}),
+		).
+		Owns(&batchv1.Job{}).
 		Complete(r)
 }
diff --git a/controllers/secret/register.go b/controllers/secret/register.go
index 9ad01f15b..0c5461ab4 100644
--- a/controllers/secret/register.go
+++ b/controllers/secret/register.go
@@ -28,12 +28,12 @@ const controllerName = "secret-controller"
 
 // RegisterWithManager registers the Secret Controller with the given controller manager.
 func (r *Reconciler) RegisterWithManager(mgr ctrl.Manager) error {
-	builder := ctrl.NewControllerManagedBy(mgr).WithOptions(controller.Options{
-		MaxConcurrentReconciles: r.Config.Workers,
-	})
-
-	c, err := builder.
+	c, err := ctrl.
+		NewControllerManagedBy(mgr).
 		Named(controllerName).
+		WithOptions(controller.Options{
+			MaxConcurrentReconciles: r.Config.Workers,
+		}).
 		For(&corev1.Secret{}).
 		Build(r)
 	if err != nil {