chore: remove unused field in controllers (#1147)

Author: simonpasquier

pkg/controllers/monitoring/monitoring-stack/controller.go

@@ -30,7 +30,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"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/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
@@ -41,7 +40,6 @@ type resourceManager struct {
 	k8sClient    client.Client
 	scheme       *runtime.Scheme
 	logger       logr.Logger
-	controller   controller.Controller
 	prometheus   PrometheusConfiguration
 	alertmanager AlertmanagerConfiguration
 	thanos       ThanosConfiguration
@@ -103,7 +101,7 @@ func RegisterWithManager(mgr ctrl.Manager, opts Options) error {
 	// be notified about changes in their status.
 	generationChanged := builder.WithPredicates(predicate.GenerationChangedPredicate{})
 
-	ctrl, err := ctrl.NewControllerManagedBy(mgr).
+	return ctrl.NewControllerManagedBy(mgr).
 		For(&stack.MonitoringStack{}).
 		Owns(&monv1.Prometheus{}, builder.WithPredicates(predicate.ResourceVersionChangedPredicate{})).
 		Owns(&monv1.Alertmanager{}, generationChanged).
@@ -113,13 +111,7 @@ func RegisterWithManager(mgr ctrl.Manager, opts Options) error {
 		Owns(&rbacv1.RoleBinding{}, generationChanged).
 		Owns(&monv1.ServiceMonitor{}, generationChanged).
 		Owns(&policyv1.PodDisruptionBudget{}, generationChanged).
-		Build(rm)
-
-	if err != nil {
-		return err
-	}
-	rm.controller = ctrl
-	return nil
+		Complete(rm)
 }
 
 func (rm resourceManager) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

pkg/controllers/observability/observability_controller.go

@@ -287,19 +287,20 @@ func RegisterWithManager(mgr ctrl.Manager, opts Options) error {
 		cache:           mgr.GetCache(),
 	}
 
-	ctrlBuilder := ctrl.NewControllerManagedBy(mgr).
+	ctrl, err := ctrl.NewControllerManagedBy(mgr).
 		For(&obsv1alpha1.ObservabilityInstaller{}).
 		Owns(&olmv1alpha1.Subscription{}).
 		Owns(&corev1.Secret{}).
 		Owns(&corev1.Namespace{}).
 		Owns(&uiv1alpha1.UIPlugin{}).
 		Owns(&rbacv1.ClusterRole{}).
 		Owns(&rbacv1.ClusterRoleBinding{}).
-		Named("cluster-observability")
-
-	controller.controller, err = ctrlBuilder.Build(controller)
+		Named("cluster-observability").
+		Build(controller)
 	if err != nil {
 		return err
 	}
+
+	controller.controller = ctrl
 	return nil
 }

pkg/controllers/operator/controller.go

@@ -28,16 +28,14 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"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/predicate"
 )
 
 type resourceManager struct {
-	k8sClient  client.Client
-	scheme     *runtime.Scheme
-	logger     logr.Logger
-	controller controller.Controller
-	namespace  string
+	k8sClient client.Client
+	scheme    *runtime.Scheme
+	logger    logr.Logger
+	namespace string
 }
 
 // RBAC for managing Prometheus Operator CRs
@@ -62,7 +60,7 @@ func RegisterWithManager(mgr ctrl.Manager, namespace string) error {
 	// child status changes.
 	generationChanged := builder.WithPredicates(predicate.GenerationChangedPredicate{})
 
-	ctrl, err := ctrl.NewControllerManagedBy(mgr).
+	return ctrl.NewControllerManagedBy(mgr).
 		For(
 			&corev1.Service{},
 			builder.WithPredicates(predicate.NewPredicateFuncs(func(object client.Object) bool {
@@ -71,13 +69,7 @@ func RegisterWithManager(mgr ctrl.Manager, namespace string) error {
 		).
 		Named(name).
 		Owns(&monv1.ServiceMonitor{}, generationChanged).
-		Build(rm)
-
-	if err != nil {
-		return err
-	}
-	rm.controller = ctrl
-	return nil
+		Complete(rm)
 }
 
 func (rm resourceManager) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

pkg/controllers/uiplugin/controller.go

@@ -25,7 +25,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"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/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
 
@@ -38,7 +37,6 @@ type resourceManager struct {
 	k8sDynamicClient dynamic.Interface
 	scheme           *runtime.Scheme
 	logger           logr.Logger
-	controller       controller.Controller
 	pluginConf       UIPluginsConfiguration
 	clusterVersion   string
 	apiReader        client.Reader
@@ -166,14 +164,7 @@ func RegisterWithManager(mgr ctrl.Manager, opts Options) error {
 		ctrlBuilder.Owns(&osv1alpha1.ConsolePlugin{}, generationChanged)
 	}
 
-	ctrl, err := ctrlBuilder.Build(rm)
-
-	if err != nil {
-		return err
-	}
-	rm.controller = ctrl
-
-	return nil
+	return ctrlBuilder.Complete(rm)
 }
 
 func (rm resourceManager) consolePluginCapabilityEnabled(ctx context.Context, name types.NamespacedName, clusterVersion string) bool {