From dcafa71d674812f9b399af8888c1c8e71c55c0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20S=C4=99k?= <tomasz.sek.88@gmail.com>
Date: Wed, 16 Jan 2019 11:17:45 +0100
Subject: [PATCH] Small refactoring

---
 cmd/manager/main.go           | 16 ++++++++--------
 pkg/controller/add_jenkins.go | 10 ----------
 pkg/controller/controller.go  | 18 ------------------
 3 files changed, 8 insertions(+), 36 deletions(-)
 delete mode 100644 pkg/controller/add_jenkins.go
 delete mode 100644 pkg/controller/controller.go

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
index 3d0b3e91..65324693 100644
--- a/cmd/manager/main.go
+++ b/cmd/manager/main.go
@@ -9,7 +9,7 @@ import (
 	"runtime"
 
 	"github.com/VirtusLab/jenkins-operator/pkg/apis"
-	"github.com/VirtusLab/jenkins-operator/pkg/controller"
+	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins"
 	"github.com/VirtusLab/jenkins-operator/pkg/log"
 	"github.com/VirtusLab/jenkins-operator/version"
 
@@ -46,13 +46,13 @@ func main() {
 	}
 	logger.Info(fmt.Sprintf("watch namespace: %v", namespace))
 
-	// Get a config to talk to the apiserver
+	// get a config to talk to the apiserver
 	cfg, err := config.GetConfig()
 	if err != nil {
 		fatal(err, "failed to get config")
 	}
 
-	// Become the leader before proceeding
+	// become the leader before proceeding
 	err = leader.Become(context.TODO(), "jenkins-operator-lock")
 	if err != nil {
 		fatal(err, "failed to become leader")
@@ -67,7 +67,7 @@ func main() {
 		_ = r.Unset()
 	}()
 
-	// Create a new Cmd to provide shared dependencies and start components
+	// create a new Cmd to provide shared dependencies and start components
 	mgr, err := manager.New(cfg, manager.Options{Namespace: namespace})
 	if err != nil {
 		fatal(err, "failed to create manager")
@@ -75,19 +75,19 @@ func main() {
 
 	logger.Info("Registering Components.")
 
-	// Setup Scheme for all resources
+	// setup Scheme for all resources
 	if err := apis.AddToScheme(mgr.GetScheme()); err != nil {
 		fatal(err, "failed to setup scheme")
 	}
 
-	// Setup all Controllers
-	if err := controller.AddToManager(mgr, *local, *minikube); err != nil {
+	// setup Jenkins controller
+	if err := jenkins.Add(mgr, *local, *minikube); err != nil {
 		fatal(err, "failed to setup controllers")
 	}
 
 	logger.Info("Starting the Cmd.")
 
-	// Start the Cmd
+	// start the Cmd
 	if err := mgr.Start(signals.SetupSignalHandler()); err != nil {
 		fatal(err, "failed to start cmd")
 	}
diff --git a/pkg/controller/add_jenkins.go b/pkg/controller/add_jenkins.go
deleted file mode 100644
index cac62ffc..00000000
--- a/pkg/controller/add_jenkins.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package controller
-
-import (
-	"github.com/VirtusLab/jenkins-operator/pkg/controller/jenkins"
-)
-
-func init() {
-	// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
-	AddToManagerFuncs = append(AddToManagerFuncs, jenkins.Add)
-}
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
deleted file mode 100644
index fa1f2a88..00000000
--- a/pkg/controller/controller.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package controller
-
-import (
-	"sigs.k8s.io/controller-runtime/pkg/manager"
-)
-
-// AddToManagerFuncs is a list of functions to add all Controllers to the Manager
-var AddToManagerFuncs []func(manager manager.Manager, local, minikube bool) error
-
-// AddToManager adds all Controllers to the Manager
-func AddToManager(m manager.Manager, local, minikube bool) error {
-	for _, f := range AddToManagerFuncs {
-		if err := f(m, local, minikube); err != nil {
-			return err
-		}
-	}
-	return nil
-}