Rename controller packages to controllers

cynepco3hahue · Apr 4, 2019 · f4a13fb · f4a13fb
1 parent 3a55980
commit f4a13fb
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 15 deletions.
diff --git a/cmd/machine-healthcheck/main.go b/cmd/machine-healthcheck/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/glog"
 	mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	"github.com/openshift/machine-api-operator/pkg/apis/healthchecking/v1alpha1"
-	"github.com/openshift/machine-api-operator/pkg/controller"
+	"github.com/openshift/machine-api-operator/pkg/controllers"
 	sdkVersion "github.com/operator-framework/operator-sdk/version"
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -48,7 +48,7 @@ func main() {
 	}
 
 	// Setup all Controllers
-	if err := controller.AddToManager(mgr); err != nil {
+	if err := controllers.AddToManager(mgr); err != nil {
 		glog.Fatal(err)
 	}
 

diff --git a/pkg/controller/add_controllers.go b/pkg/controller/add_controllers.go
diff --git a/pkg/controllers/add_disruption.go b/pkg/controllers/add_disruption.go
@@ -0,0 +1,10 @@
+package controllers
+
+import (
+	"github.com/openshift/machine-api-operator/pkg/controllers/disruption"
+)
+
+func init() {
+	// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
+	AddToManagerFuncs = append(AddToManagerFuncs, disruption.Add)
+}
diff --git a/pkg/controllers/add_machinehealthcheck.go b/pkg/controllers/add_machinehealthcheck.go
@@ -0,0 +1,10 @@
+package controllers
+
+import (
+	"github.com/openshift/machine-api-operator/pkg/controllers/machinehealthcheck"
+)
+
+func init() {
+	// AddToManagerFuncs is a list of functions to create controllers and add them to a manager.
+	AddToManagerFuncs = append(AddToManagerFuncs, machinehealthcheck.Add)
+}
diff --git a/pkg/controller/controller.go → pkg/controllers/controllers.go b/pkg/controller/controller.go → pkg/controllers/controllers.go
@@ -1,4 +1,4 @@
-package controller
+package controllers
 
 import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"

diff --git a/pkg/controller/disruption/disruption.go → pkg/controllers/disruption/disruption.go b/pkg/controller/disruption/disruption.go → pkg/controllers/disruption/disruption.go
diff --git a/pkg/controller/machinehealthcheck/OWNERS → pkg/controllers/machinehealthcheck/OWNERS b/pkg/controller/machinehealthcheck/OWNERS → pkg/controllers/machinehealthcheck/OWNERS
diff --git a/...lthcheck/machinehealthcheck_controller.go → .../machinehealthcheck/machinehealthcheck.go b/...lthcheck/machinehealthcheck_controller.go → .../machinehealthcheck/machinehealthcheck.go
diff --git a/...eck/machinehealthcheck_controller_test.go → ...inehealthcheck/machinehealthcheck_test.go b/...eck/machinehealthcheck_controller_test.go → ...inehealthcheck/machinehealthcheck_test.go