Reduce the indirection by directly referencing controllers (#694)

kudobuilder · Aug 13, 2019 · eddf74b · eddf74b
1 parent 6fab360
commit eddf74b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 107 deletions.
diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -65,7 +65,7 @@ func main() {
 
 	// Setup all Controllers
 	log.Info("Setting up controller")
-	if err := controller.AddToManager(mgr); err != nil {
+	if err := controller.AddControllersToManager(mgr); err != nil {
 		log.Error(err, "unable to register controllers to the manager")
 		os.Exit(1)
 	}

diff --git a/pkg/controller/add_instance.go b/pkg/controller/add_instance.go
diff --git a/pkg/controller/add_operator.go b/pkg/controller/add_operator.go
diff --git a/pkg/controller/add_operatorversion.go b/pkg/controller/add_operatorversion.go
diff --git a/pkg/controller/add_planexecution.go b/pkg/controller/add_planexecution.go
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -16,15 +16,24 @@ limitations under the License.
 package controller
 
 import (
+	"github.com/kudobuilder/kudo/pkg/controller/instance"
+	"github.com/kudobuilder/kudo/pkg/controller/operator"
+	"github.com/kudobuilder/kudo/pkg/controller/operatorversion"
+	"github.com/kudobuilder/kudo/pkg/controller/planexecution"
 	"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) error
+// AddControllerToManagerFuncs is a list of functions to add all Controllers to the Manager
+var AddControllerToManagerFuncs = []func(manager.Manager) error{
+	planexecution.Add,
+	instance.Add,
+	operator.Add,
+	operatorversion.Add,
+}
 
-// AddToManager adds all Controllers to the Manager
-func AddToManager(m manager.Manager) error {
-	for _, f := range AddToManagerFuncs {
+// AddControllersToManager adds all Controllers to the Manager
+func AddControllersToManager(m manager.Manager) error {
+	for _, f := range AddControllerToManagerFuncs {
 		if err := f(m); err != nil {
 			return err
 		}

diff --git a/pkg/test/harness.go b/pkg/test/harness.go
@@ -201,7 +201,7 @@ func (h *Harness) RunKUDO() error {
 		return err
 	}
 
-	if err = controller.AddToManager(mgr); err != nil {
+	if err = controller.AddControllersToManager(mgr); err != nil {
 		return err
 	}