Merge pull request #348 from ingvagabund/set-namespace-explicitly

Set machine healthchecking namespace through a flag

Author: openshift-merge-robot

cmd/machine-healthcheck/main.go

@@ -58,13 +58,8 @@ func main() {
 		glog.Fatal(err)
 	}
 
-	AddToHealthCheckingManagerFuncs := []func(manager.Manager) error{
-		machinehealthcheck.Add,
-		disruption.Add,
-	}
-
 	// Setup all Controllers
-	if err := controller.AddToManager(mgr, AddToHealthCheckingManagerFuncs); err != nil {
+	if err := controller.AddToManager(mgr, opts, machinehealthcheck.Add, disruption.Add); err != nil {
 		glog.Fatal(err)
 	}
 

cmd/nodelink-controller/main.go

@@ -54,11 +54,8 @@ func main() {
 		klog.Fatal(err)
 	}
 
-	AddToNodeLinkManagerFuncs := []func(manager.Manager) error{
-		nodelink.Add,
-	}
 	// Setup all Controllers
-	if err := controller.AddToManager(mgr, AddToNodeLinkManagerFuncs); err != nil {
+	if err := controller.AddToManager(mgr, opts, nodelink.Add); err != nil {
 		klog.Fatal(err)
 	}
 

pkg/controller/controller.go

@@ -5,9 +5,9 @@ import (
 )
 
 // AddToManager adds all Controllers to the Manager
-func AddToManager(m manager.Manager, fnList []func(manager.Manager) error) error {
+func AddToManager(m manager.Manager, opts manager.Options, fnList ...func(manager.Manager, manager.Options) error) error {
 	for _, f := range fnList {
-		if err := f(m); err != nil {
+		if err := f(m, opts); err != nil {
 			return err
 		}
 	}

pkg/controller/disruption/disruption.go

@@ -8,7 +8,6 @@ import (
 	"github.com/golang/glog"
 	mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	healthcheckingv1alpha1 "github.com/openshift/machine-api-operator/pkg/apis/healthchecking/v1alpha1"
-	"github.com/openshift/machine-api-operator/pkg/util"
 	machineutil "github.com/openshift/machine-api-operator/pkg/util/machines"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 
@@ -40,29 +39,18 @@ const DeletionTimeout = 2 * time.Minute
 
 // Add creates a new MachineDisruption Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and start it when the Manager is started.
-func Add(mgr manager.Manager) error {
-	r, err := newReconciler(mgr)
-	if err != nil {
-		return err
-	}
+func Add(mgr manager.Manager, opts manager.Options) error {
+	r := newReconciler(mgr, opts)
 	return add(mgr, r, r.machineToMachineDisruptionBudget)
 }
 
 // newReconciler returns a new reconcile.Reconciler
-func newReconciler(mgr manager.Manager) (*ReconcileMachineDisruption, error) {
-	r := &ReconcileMachineDisruption{
+func newReconciler(mgr manager.Manager, opts manager.Options) *ReconcileMachineDisruption {
+	return &ReconcileMachineDisruption{
 		client:   mgr.GetClient(),
 		scheme:   mgr.GetScheme(),
 		recorder: mgr.GetEventRecorderFor("machine-disruption-controller"),
 	}
-
-	ns, err := util.GetNamespace(util.ServiceAccountNamespaceFile)
-	if err != nil {
-		return r, err
-	}
-
-	r.namespace = ns
-	return r, nil
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler
@@ -86,10 +74,9 @@ var _ reconcile.Reconciler = &ReconcileMachineDisruption{}
 type ReconcileMachineDisruption struct {
 	// This client, initialized using mgr.Client() above, is a split client
 	// that reads objects from the cache and writes to the apiserver
-	client    client.Client
-	recorder  record.EventRecorder
-	scheme    *runtime.Scheme
-	namespace string
+	client   client.Client
+	recorder record.EventRecorder
+	scheme   *runtime.Scheme
 }
 
 // Reconcile reads that state of the cluster for MachineDisruptionBudget and machine objects and makes changes based on labels under

pkg/controller/disruption/disruption_test.go

@@ -31,10 +31,9 @@ func init() {
 func newFakeReconciler(recorder record.EventRecorder, initObjects ...runtime.Object) *ReconcileMachineDisruption {
 	fakeClient := fake.NewFakeClient(initObjects...)
 	return &ReconcileMachineDisruption{
-		client:    fakeClient,
-		recorder:  recorder,
-		scheme:    scheme.Scheme,
-		namespace: maotesting.Namespace,
+		client:   fakeClient,
+		recorder: recorder,
+		scheme:   scheme.Scheme,
 	}
 }
 

pkg/controller/machinehealthcheck/machinehealthcheck_controller.go

@@ -9,7 +9,6 @@ import (
 	"github.com/golang/glog"
 	mapiv1 "github.com/openshift/cluster-api/pkg/apis/machine/v1beta1"
 	healthcheckingv1alpha1 "github.com/openshift/machine-api-operator/pkg/apis/healthchecking/v1alpha1"
-	"github.com/openshift/machine-api-operator/pkg/util"
 	"github.com/openshift/machine-api-operator/pkg/util/conditions"
 
 	corev1 "k8s.io/api/core/v1"
@@ -37,28 +36,17 @@ const (
 
 // Add creates a new MachineHealthCheck Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and start it when the Manager is started.
-func Add(mgr manager.Manager) error {
-	r, err := newReconciler(mgr)
-	if err != nil {
-		return err
-	}
-	return add(mgr, r)
+func Add(mgr manager.Manager, opts manager.Options) error {
+	return add(mgr, newReconciler(mgr, opts))
 }
 
 // newReconciler returns a new reconcile.Reconciler
-func newReconciler(mgr manager.Manager) (reconcile.Reconciler, error) {
-	r := &ReconcileMachineHealthCheck{
-		client: mgr.GetClient(),
-		scheme: mgr.GetScheme(),
+func newReconciler(mgr manager.Manager, opts manager.Options) reconcile.Reconciler {
+	return &ReconcileMachineHealthCheck{
+		client:    mgr.GetClient(),
+		scheme:    mgr.GetScheme(),
+		namespace: opts.Namespace,
 	}
-
-	ns, err := util.GetNamespace(util.ServiceAccountNamespaceFile)
-	if err != nil {
-		return r, err
-	}
-
-	r.namespace = ns
-	return r, nil
 }
 
 // add adds a new Controller to mgr with r as the reconcile.Reconciler

pkg/controller/nodelink/nodelink_controller.go

@@ -44,7 +44,7 @@ type ReconcileNodeLink struct {
 
 // Add creates a new Nodelink Controller and adds it to the Manager. The Manager will set fields on the Controller
 // and Start it when the Manager is Started.
-func Add(mgr manager.Manager) error {
+func Add(mgr manager.Manager, opts manager.Options) error {
 	reconciler, err := newReconciler(mgr)
 	if err != nil {
 		return fmt.Errorf("error building reconciler: %v", err)