pass namespace option

Author: calebdoxsey

cmd/certificate_controller_options.go

@@ -1,12 +1,16 @@
 package cmd
 
-import "github.com/spf13/pflag"
+import (
+	"github.com/spf13/pflag"
+
+	"github.com/pomerium/ingress-controller/controllers/certificate"
+)
 
 type certificateControllerOptions struct {
 	Name string
 }
 
 func (o *certificateControllerOptions) setupFlags(flags *pflag.FlagSet) {
-	flags.StringVar(&o.Name, "certificate-controller-name", "pomerium-certificate",
+	flags.StringVar(&o.Name, "certificate-controller-name", certificate.DefaultControllerName,
 		"the name of the certificate controller")
 }

controllers/certificate/controller.go

@@ -20,7 +20,6 @@ import (
 	core_v1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/apimachinery/pkg/util/rand"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -41,28 +40,28 @@ const (
 )
 
 type certificateController struct {
-	globalSettingsName  types.NamespacedName
-	kubernetesClient    client.Client
-	dataBrokerClient    databrokerpb.DataBrokerServiceClient
+	cfg              *controllerConfig
+	kubernetesClient client.Client
+	dataBrokerClient databrokerpb.DataBrokerServiceClient
+
 	dataBrokerCollector *dataBrokerCollector
 }
 
 // NewCertificateController creates a new certificate controller.
 func NewCertificateController(
 	mgr controllerruntime.Manager,
-	globalSettingsName types.NamespacedName,
 	dataBrokerClient databrokerpb.DataBrokerServiceClient,
-	controllerName string,
+	options ...Option,
 ) error {
 	c := &certificateController{
-		globalSettingsName: globalSettingsName,
-		kubernetesClient:   mgr.GetClient(),
-		dataBrokerClient:   dataBrokerClient,
+		cfg:              getControllerConfig(options...),
+		kubernetesClient: mgr.GetClient(),
+		dataBrokerClient: dataBrokerClient,
 	}
 	c.dataBrokerCollector = newDataBrokerCollector(c)
 
 	err := controllerruntime.NewControllerManagedBy(mgr).
-		Named(controllerName).
+		Named(c.cfg.controllerName).
 		Watches(new(core_v1.Secret), &handler.EnqueueRequestForObject{}).
 		Watches(new(pomerium_ingress_v1.Pomerium), &handler.EnqueueRequestForObject{}).
 		Watches(new(certmanager_v1.Certificate), &handler.EnqueueRequestForObject{}).
@@ -83,7 +82,7 @@ func (c *certificateController) reconcile(ctx context.Context) error {
 	// retrieve the settings, certificates and secrets
 
 	var settings pomerium_ingress_v1.Pomerium
-	if err := c.kubernetesClient.Get(ctx, c.globalSettingsName, &settings); err != nil {
+	if err := c.kubernetesClient.Get(ctx, c.cfg.globalSettingsName, &settings); err != nil {
 		return fmt.Errorf("error retrieving pomerium settings: %w", err)
 	}
 
@@ -106,6 +105,10 @@ func (c *certificateController) reconcile(ctx context.Context) error {
 		}
 	}
 
+	if c.cfg.namespace != nil {
+		namespace = *c.cfg.namespace
+	}
+
 	// if no namespace was defined, use the current pod namespace
 	if namespace == "" {
 		var err error

controllers/certificate/controller_options.go

@@ -0,0 +1,47 @@
+package certificate
+
+import "k8s.io/apimachinery/pkg/types"
+
+// DefaultControllerName is the default controller name.
+var DefaultControllerName = "pomerium-certificate"
+
+type controllerConfig struct {
+	controllerName     string
+	globalSettingsName types.NamespacedName
+	// if not set, discover the namespace from the issuer or the pod where the
+	// controller is running
+	namespace *string
+}
+
+// An Option customizes the config.
+type Option func(cfg *controllerConfig)
+
+// WithControllerName sets the controller name in the config.
+func WithControllerName(controllerName string) Option {
+	return func(cfg *controllerConfig) {
+		cfg.controllerName = controllerName
+	}
+}
+
+// WithGlobalSettingsName sets the global settings name in the config.
+func WithGlobalSettingsName(globalSettingsName types.NamespacedName) Option {
+	return func(cfg *controllerConfig) {
+		cfg.globalSettingsName = globalSettingsName
+	}
+}
+
+// WithNamespace sets the namespace option in the config.
+func WithNamespace(namespace string) Option {
+	return func(cfg *controllerConfig) {
+		cfg.namespace = new(namespace)
+	}
+}
+
+func getControllerConfig(options ...Option) *controllerConfig {
+	cfg := new(controllerConfig)
+	WithControllerName(DefaultControllerName)(cfg)
+	for _, o := range options {
+		o(cfg)
+	}
+	return cfg
+}

controllers/certificate/databroker.go

@@ -196,17 +196,17 @@ func (c *dataBrokerCollector) sync(ctx context.Context) error {
 
 		if err := c.controller.kubernetesClient.Status().Patch(ctx, &pomerium_ingress_v1.Pomerium{
 			ObjectMeta: meta_v1.ObjectMeta{
-				Namespace: c.controller.globalSettingsName.Namespace,
-				Name:      c.controller.globalSettingsName.Name,
+				Namespace: c.controller.cfg.globalSettingsName.Namespace,
+				Name:      c.controller.cfg.globalSettingsName.Name,
 			},
 			Status: pomerium_ingress_v1.PomeriumStatus{
 				CertificateAutoProvisionStatus: &pomerium_ingress_v1.CertificateAutoProvisionStatus{
 					DataBrokerLastUpdated: meta_v1.Now(),
 				},
 			},
 		}, client.MergeFrom(&pomerium_ingress_v1.Pomerium{ObjectMeta: meta_v1.ObjectMeta{
-			Namespace: c.controller.globalSettingsName.Namespace,
-			Name:      c.controller.globalSettingsName.Name,
+			Namespace: c.controller.cfg.globalSettingsName.Namespace,
+			Name:      c.controller.cfg.globalSettingsName.Name,
 		}})); err != nil {
 			log.FromContext(ctx).Error(err, "error creating event")
 		}

controllers/certificate/integration_test.go

@@ -130,9 +130,9 @@ func (s *ControllerTestSuite) startController(ctx context.Context, client databr
 	s.NoError(err)
 	s.NoError(certificate.NewCertificateController(
 		mgr,
-		types.NamespacedName{Name: testGlobalSettingsName},
 		client,
-		testNamespace,
+		certificate.WithGlobalSettingsName(types.NamespacedName{Name: testGlobalSettingsName}),
+		certificate.WithNamespace(testNamespace),
 	))
 
 	go func() {

controllers/config_controller.go

@@ -93,7 +93,9 @@ func (c *Controller) RunLeased(ctx context.Context) (err error) {
 		if err = settings.NewSettingsController(mgr, c.Reconciler, *c.GlobalSettings, "pomerium-crd", true, health_ctrl.SettingsReconciler); err != nil {
 			return fmt.Errorf("create settings controller: %w", err)
 		}
-		if err = certificate.NewCertificateController(mgr, *c.GlobalSettings, c.DataBrokerServiceClient, c.CertificateControllerName); err != nil {
+		if err = certificate.NewCertificateController(mgr, c.DataBrokerServiceClient,
+			certificate.WithControllerName(c.CertificateControllerName),
+			certificate.WithGlobalSettingsName(*c.GlobalSettings)); err != nil {
 			return fmt.Errorf("error creating certificate controller: %w", err)
 		}
 	} else {