Make operator namespace customisable (#57)

clients/clients.go

@@ -115,6 +115,11 @@ func GetClient() (ClientCache, error) {
 	var err error
 	var config *rest.Config
 
+	namespace := os.Getenv("NAMESPACE")
+	if namespace == "" {
+		namespace = "default"
+	}
+
 	config, err = rest.InClusterConfig()
 	if err != nil {
 		config, err = clientcmd.BuildConfigFromFlags("", kubeconfig)
@@ -132,7 +137,7 @@ func GetClient() (ClientCache, error) {
 		return clientCache, err
 	}
 
-	clientCache.Cache, err = cache.New(config, cache.Options{Namespace: "default", Scheme: scheme})
+	clientCache.Cache, err = cache.New(config, cache.Options{Namespace: namespace, Scheme: scheme})
 	if err != nil {
 		return clientCache, err
 	}

controllers/booking_controller_test.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"os"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -15,10 +16,10 @@ import (
 )
 
 var _ = Describe("Booking controller", func() {
+	ctx := context.Background()
 
 	const (
 		BookingName         = "test-booking"
-		BookingNamespace    = "default"
 		BookingResourceName = "analytics"
 	)
 
@@ -32,9 +33,13 @@ var _ = Describe("Booking controller", func() {
 
 		FinishedBookingStart = fmt.Sprintf("%d-01-01T00:00:00Z", time.Now().AddDate(-1, 0, 0).Year())
 		FinishedBookingEnd   = fmt.Sprintf("%d-01-02T00:00:00Z", time.Now().AddDate(-1, 0, 0).Year())
+
+		BookingNamespace = os.Getenv("NAMESPACE")
 	)
 
-	ctx := context.Background()
+	if BookingNamespace == "" {
+		BookingNamespace = "default"
+	}
 
 	var bookingSpec managerv1.BookingSpec
 	var booking *managerv1.Booking

controllers/resource_controller_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"os"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -14,18 +15,21 @@ import (
 )
 
 var _ = Describe("Resource controller", func() {
+	ctx := context.Background()
 
 	const (
-		ResourceName      = "test-resource"
-		ResourceTag       = "analytics"
-		ResourceType      = "ec2"
-		ResourceNamespace = "default"
+		ResourceName = "test-resource"
+		ResourceTag  = "analytics"
+		ResourceType = "ec2"
 
 		timeout  = time.Second * 10
 		interval = time.Millisecond * 250
 	)
 
-	ctx := context.Background()
+	ResourceNamespace := os.Getenv("NAMESPACE")
+	if ResourceNamespace == "" {
+		ResourceNamespace = "default"
+	}
 
 	Context("Resource basics", func() {
 		BeforeEach(func() {

controllers/resourcemonitor_controller_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"os"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -13,17 +14,20 @@ import (
 )
 
 var _ = Describe("Resource Monitor controller", func() {
+	ctx := context.Background()
 
 	const (
-		ResourceName      = "test-resource-monitor"
-		ResourceType      = "ec2"
-		ResourceNamespace = "default"
+		ResourceName = "test-resource-monitor"
+		ResourceType = "ec2"
 
 		timeout  = time.Second * 3
 		interval = time.Millisecond * 250
 	)
 
-	ctx := context.Background()
+	ResourceNamespace := os.Getenv("NAMESPACE")
+	if ResourceNamespace == "" {
+		ResourceNamespace = "default"
+	}
 
 	Context("Resource monitor management", func() {
 		BeforeEach(func() {

main.go

@@ -52,6 +52,12 @@ func main() {
 	var metricsAddr string
 	var enableLeaderElection bool
 	var probeAddr string
+
+	namespace := os.Getenv("NAMESPACE")
+	if namespace == "" {
+		namespace = "default"
+	}
+
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
@@ -67,6 +73,7 @@ func main() {
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
+		Namespace:              namespace,
 		MetricsBindAddress:     metricsAddr,
 		Port:                   9443,
 		HealthProbeBindAddress: probeAddr,