From 948e6debee02d11f1f6124d40819f7e1c157f402 Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 17:15:18 +0100
Subject: [PATCH 1/6] limit target namespaces

---
 cyclops-ctrl/.env                             |  1 +
 cyclops-ctrl/cmd/main/main.go                 | 18 +++++++++-
 cyclops-ctrl/pkg/cluster/k8sclient/client.go  | 36 +++++++++++--------
 .../pkg/cluster/k8sclient/resources.go        |  4 +++
 .../components/pages/NewModule/NewModule.tsx  |  3 --
 5 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/cyclops-ctrl/.env b/cyclops-ctrl/.env
index 011a7a1d..4291c074 100644
--- a/cyclops-ctrl/.env
+++ b/cyclops-ctrl/.env
@@ -3,3 +3,4 @@ PORT=8888
 WATCH_NAMESPACE=cyclops
 WATCH_NAMESPACE_HELM=
 CYCLOPS_VERSION=v0.0.0
+MODULE_TARGET_NAMESPACES=
diff --git a/cyclops-ctrl/cmd/main/main.go b/cyclops-ctrl/cmd/main/main.go
index 1f905812..e6dae479 100644
--- a/cyclops-ctrl/cmd/main/main.go
+++ b/cyclops-ctrl/cmd/main/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"strconv"
+	"strings"
 	"time"
 
 	_ "github.com/joho/godotenv/autoload"
@@ -74,7 +75,12 @@ func main() {
 	watchNamespace := getWatchNamespace()
 	helmWatchNamespace := getHelmWatchNamespace()
 
-	k8sClient, err := k8sclient.New(watchNamespace, helmWatchNamespace, zap.New(zap.UseFlagOptions(&opts)))
+	k8sClient, err := k8sclient.New(
+		watchNamespace,
+		helmWatchNamespace,
+		getModuleTargetNamespaces(),
+		zap.New(zap.UseFlagOptions(&opts)),
+	)
 	if err != nil {
 		fmt.Println("error bootstrapping Kubernetes client", err)
 		panic(err)
@@ -182,3 +188,13 @@ func getHelmWatchNamespace() string {
 	}
 	return value
 }
+
+func getModuleTargetNamespaces() []string {
+	envVar := os.Getenv("MODULE_TARGET_NAMESPACES")
+
+	if envVar == "" {
+		return []string{}
+	}
+
+	return strings.Split(envVar, ",")
+}
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/client.go b/cyclops-ctrl/pkg/cluster/k8sclient/client.go
index 8d39751e..7f5f9f18 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/client.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/client.go
@@ -20,17 +20,24 @@ import (
 )
 
 type KubernetesClient struct {
-	Dynamic              dynamic.Interface
-	clientset            *kubernetes.Clientset
-	discovery            *discovery.DiscoveryClient
-	moduleset            *client.CyclopsV1Alpha1Client
-	moduleNamespace      string
-	helmReleaseNamespace string
+	Dynamic   dynamic.Interface
+	clientset *kubernetes.Clientset
+	discovery *discovery.DiscoveryClient
+	moduleset *client.CyclopsV1Alpha1Client
+
+	moduleNamespace        string
+	helmReleaseNamespace   string
+	moduleTargetNamespaces []string
 
 	logger logr.Logger
 }
 
-func New(moduleNamespace, helmReleaseNamespace string, logger logr.Logger) (*KubernetesClient, error) {
+func New(
+	moduleNamespace string,
+	helmReleaseNamespace string,
+	moduleTargetNamespaces []string,
+	logger logr.Logger,
+) (*KubernetesClient, error) {
 	config := ctrl.GetConfigOrDie()
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
@@ -50,13 +57,14 @@ func New(moduleNamespace, helmReleaseNamespace string, logger logr.Logger) (*Kub
 	}
 
 	return &KubernetesClient{
-		Dynamic:              dynamic,
-		discovery:            discovery,
-		clientset:            clientset,
-		moduleset:            moduleSet,
-		moduleNamespace:      moduleNamespace,
-		helmReleaseNamespace: helmReleaseNamespace,
-		logger:               logger,
+		Dynamic:                dynamic,
+		discovery:              discovery,
+		clientset:              clientset,
+		moduleset:              moduleSet,
+		moduleNamespace:        moduleNamespace,
+		helmReleaseNamespace:   helmReleaseNamespace,
+		moduleTargetNamespaces: moduleTargetNamespaces,
+		logger:                 logger,
 	}, nil
 }
 
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/resources.go b/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
index 78f21895..11427cf8 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
@@ -370,6 +370,10 @@ func (k *KubernetesClient) GetPodsForNode(nodeName string) ([]apiv1.Pod, error)
 }
 
 func (k *KubernetesClient) ListNamespaces() ([]string, error) {
+	if len(k.moduleTargetNamespaces) > 0 {
+		return k.moduleTargetNamespaces, nil
+	}
+
 	namespaceList, err := k.clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		return nil, err
diff --git a/cyclops-ui/src/components/pages/NewModule/NewModule.tsx b/cyclops-ui/src/components/pages/NewModule/NewModule.tsx
index cd65a9f5..ae34a628 100644
--- a/cyclops-ui/src/components/pages/NewModule/NewModule.tsx
+++ b/cyclops-ui/src/components/pages/NewModule/NewModule.tsx
@@ -565,9 +565,6 @@ const NewModule = () => {
                       showSearch={true}
                       onChange={onTemplateStoreSelected}
                       style={{ width: "100%" }}
-                      placeholder="default"
-                      value="default"
-                      defaultValue="default"
                     >
                       {namespaces.map((namespace: string) => (
                         <Option key={namespace} value={namespace}>

From 4d1712b21cece5f7b15ebfad2999d466b122b70d Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 19:01:40 +0100
Subject: [PATCH 2/6] limit target namespaces

---
 cyclops-ctrl/.env                             |  2 +-
 cyclops-ctrl/cmd/main/main.go                 | 20 ++++++----------
 cyclops-ctrl/internal/controller/modules.go   | 23 ++++++++++++------
 cyclops-ctrl/internal/handler/handler.go      | 20 +++++++++-------
 cyclops-ctrl/pkg/cluster/k8sclient/client.go  | 24 +++++++++----------
 .../pkg/cluster/k8sclient/resources.go        |  4 ++--
 6 files changed, 50 insertions(+), 43 deletions(-)

diff --git a/cyclops-ctrl/.env b/cyclops-ctrl/.env
index 4291c074..0d1b23ee 100644
--- a/cyclops-ctrl/.env
+++ b/cyclops-ctrl/.env
@@ -3,4 +3,4 @@ PORT=8888
 WATCH_NAMESPACE=cyclops
 WATCH_NAMESPACE_HELM=
 CYCLOPS_VERSION=v0.0.0
-MODULE_TARGET_NAMESPACES=
+MODULE_TARGET_NAMESPACE=
diff --git a/cyclops-ctrl/cmd/main/main.go b/cyclops-ctrl/cmd/main/main.go
index e6dae479..96bf0115 100644
--- a/cyclops-ctrl/cmd/main/main.go
+++ b/cyclops-ctrl/cmd/main/main.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 	"strconv"
-	"strings"
 	"time"
 
 	_ "github.com/joho/godotenv/autoload"
@@ -74,11 +73,12 @@ func main() {
 
 	watchNamespace := getWatchNamespace()
 	helmWatchNamespace := getHelmWatchNamespace()
+	moduleTargetNamespace := getModuleTargetNamespace()
 
 	k8sClient, err := k8sclient.New(
 		watchNamespace,
 		helmWatchNamespace,
-		getModuleTargetNamespaces(),
+		moduleTargetNamespace,
 		zap.New(zap.UseFlagOptions(&opts)),
 	)
 	if err != nil {
@@ -102,7 +102,7 @@ func main() {
 
 	helmReleaseClient := helm.NewReleaseClient(helmWatchNamespace)
 
-	handler, err := handler.New(templatesRepo, k8sClient, helmReleaseClient, renderer, telemetryClient, monitor)
+	handler, err := handler.New(templatesRepo, k8sClient, helmReleaseClient, renderer, moduleTargetNamespace, telemetryClient, monitor)
 	if err != nil {
 		panic(err)
 	}
@@ -181,6 +181,10 @@ func getWatchNamespace() string {
 	return value
 }
 
+func getModuleTargetNamespace() string {
+	return os.Getenv("MODULE_TARGET_NAMESPACE")
+}
+
 func getHelmWatchNamespace() string {
 	value := os.Getenv("WATCH_NAMESPACE_HELM")
 	if value == "" {
@@ -188,13 +192,3 @@ func getHelmWatchNamespace() string {
 	}
 	return value
 }
-
-func getModuleTargetNamespaces() []string {
-	envVar := os.Getenv("MODULE_TARGET_NAMESPACES")
-
-	if envVar == "" {
-		return []string{}
-	}
-
-	return strings.Split(envVar, ",")
-}
diff --git a/cyclops-ctrl/internal/controller/modules.go b/cyclops-ctrl/internal/controller/modules.go
index 05d4ff1e..9bff3d05 100644
--- a/cyclops-ctrl/internal/controller/modules.go
+++ b/cyclops-ctrl/internal/controller/modules.go
@@ -27,23 +27,28 @@ type Modules struct {
 	kubernetesClient k8sclient.IKubernetesClient
 	templatesRepo    template.ITemplateRepo
 	renderer         *render.Renderer
-	telemetryClient  telemetry.Client
-	monitor          prometheus.Monitor
+
+	moduleTargetNamespace string
+
+	telemetryClient telemetry.Client
+	monitor         prometheus.Monitor
 }
 
 func NewModulesController(
 	templatesRepo template.ITemplateRepo,
 	kubernetes k8sclient.IKubernetesClient,
 	renderer *render.Renderer,
+	moduleTargetNamespace string,
 	telemetryClient telemetry.Client,
 	monitor prometheus.Monitor,
 ) *Modules {
 	return &Modules{
-		kubernetesClient: kubernetes,
-		templatesRepo:    templatesRepo,
-		renderer:         renderer,
-		telemetryClient:  telemetryClient,
-		monitor:          monitor,
+		kubernetesClient:      kubernetes,
+		templatesRepo:         templatesRepo,
+		renderer:              renderer,
+		moduleTargetNamespace: moduleTargetNamespace,
+		telemetryClient:       telemetryClient,
+		monitor:               monitor,
 	}
 }
 
@@ -268,6 +273,10 @@ func (m *Modules) CreateModule(ctx *gin.Context) {
 		return
 	}
 
+	if len(m.moduleTargetNamespace) > 0 {
+		module.Spec.TargetNamespace = m.moduleTargetNamespace
+	}
+
 	m.telemetryClient.ModuleCreation()
 
 	err = m.kubernetesClient.CreateModule(module)
diff --git a/cyclops-ctrl/internal/handler/handler.go b/cyclops-ctrl/internal/handler/handler.go
index f31f158f..eb5d6cea 100644
--- a/cyclops-ctrl/internal/handler/handler.go
+++ b/cyclops-ctrl/internal/handler/handler.go
@@ -22,6 +22,8 @@ type Handler struct {
 	releaseClient *helm.ReleaseClient
 	renderer      *render.Renderer
 
+	moduleTargetNamespace string
+
 	telemetryClient telemetry.Client
 	monitor         prometheus.Monitor
 }
@@ -31,17 +33,19 @@ func New(
 	kubernetesClient k8sclient.IKubernetesClient,
 	releaseClient *helm.ReleaseClient,
 	renderer *render.Renderer,
+	moduleTargetNamespace string,
 	telemetryClient telemetry.Client,
 	monitor prometheus.Monitor,
 ) (*Handler, error) {
 	return &Handler{
-		templatesRepo:   templatesRepo,
-		k8sClient:       kubernetesClient,
-		renderer:        renderer,
-		releaseClient:   releaseClient,
-		telemetryClient: telemetryClient,
-		monitor:         monitor,
-		router:          gin.New(),
+		templatesRepo:         templatesRepo,
+		k8sClient:             kubernetesClient,
+		renderer:              renderer,
+		releaseClient:         releaseClient,
+		moduleTargetNamespace: moduleTargetNamespace,
+		telemetryClient:       telemetryClient,
+		monitor:               monitor,
+		router:                gin.New(),
 	}, nil
 }
 
@@ -49,7 +53,7 @@ func (h *Handler) Start() error {
 	gin.SetMode(gin.DebugMode)
 
 	templatesController := controller.NewTemplatesController(h.templatesRepo, h.k8sClient, h.telemetryClient)
-	modulesController := controller.NewModulesController(h.templatesRepo, h.k8sClient, h.renderer, h.telemetryClient, h.monitor)
+	modulesController := controller.NewModulesController(h.templatesRepo, h.k8sClient, h.renderer, h.moduleTargetNamespace, h.telemetryClient, h.monitor)
 	clusterController := controller.NewClusterController(h.k8sClient)
 	helmController := controller.NewHelmController(h.k8sClient, h.releaseClient, h.telemetryClient)
 
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/client.go b/cyclops-ctrl/pkg/cluster/k8sclient/client.go
index 7f5f9f18..abee5b57 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/client.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/client.go
@@ -25,9 +25,9 @@ type KubernetesClient struct {
 	discovery *discovery.DiscoveryClient
 	moduleset *client.CyclopsV1Alpha1Client
 
-	moduleNamespace        string
-	helmReleaseNamespace   string
-	moduleTargetNamespaces []string
+	moduleNamespace       string
+	helmReleaseNamespace  string
+	moduleTargetNamespace string
 
 	logger logr.Logger
 }
@@ -35,7 +35,7 @@ type KubernetesClient struct {
 func New(
 	moduleNamespace string,
 	helmReleaseNamespace string,
-	moduleTargetNamespaces []string,
+	moduleTargetNamespace string,
 	logger logr.Logger,
 ) (*KubernetesClient, error) {
 	config := ctrl.GetConfigOrDie()
@@ -57,14 +57,14 @@ func New(
 	}
 
 	return &KubernetesClient{
-		Dynamic:                dynamic,
-		discovery:              discovery,
-		clientset:              clientset,
-		moduleset:              moduleSet,
-		moduleNamespace:        moduleNamespace,
-		helmReleaseNamespace:   helmReleaseNamespace,
-		moduleTargetNamespaces: moduleTargetNamespaces,
-		logger:                 logger,
+		Dynamic:               dynamic,
+		discovery:             discovery,
+		clientset:             clientset,
+		moduleset:             moduleSet,
+		moduleNamespace:       moduleNamespace,
+		helmReleaseNamespace:  helmReleaseNamespace,
+		moduleTargetNamespace: moduleTargetNamespace,
+		logger:                logger,
 	}, nil
 }
 
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/resources.go b/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
index 11427cf8..19faca5f 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/resources.go
@@ -370,8 +370,8 @@ func (k *KubernetesClient) GetPodsForNode(nodeName string) ([]apiv1.Pod, error)
 }
 
 func (k *KubernetesClient) ListNamespaces() ([]string, error) {
-	if len(k.moduleTargetNamespaces) > 0 {
-		return k.moduleTargetNamespaces, nil
+	if len(k.moduleTargetNamespace) > 0 {
+		return []string{k.moduleTargetNamespace}, nil
 	}
 
 	namespaceList, err := k.clientset.CoreV1().Namespaces().List(context.TODO(), metav1.ListOptions{})

From 33827f4753491529c71aebea06dc1cc9fa087702 Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 22:21:43 +0100
Subject: [PATCH 3/6] structure logging

---
 cyclops-ctrl/.env                             |  4 +--
 .../modulecontroller/module_controller.go     | 19 ++++++------
 cyclops-ctrl/pkg/cluster/k8sclient/modules.go | 30 ++++++++++++-------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/cyclops-ctrl/.env b/cyclops-ctrl/.env
index 0d1b23ee..9bd119ab 100644
--- a/cyclops-ctrl/.env
+++ b/cyclops-ctrl/.env
@@ -1,6 +1,6 @@
 DISABLE_TELEMETRY=true
 PORT=8888
-WATCH_NAMESPACE=cyclops
+WATCH_NAMESPACE=dobar
 WATCH_NAMESPACE_HELM=
 CYCLOPS_VERSION=v0.0.0
-MODULE_TARGET_NAMESPACE=
+MODULE_TARGET_NAMESPACE=dobar
diff --git a/cyclops-ctrl/internal/modulecontroller/module_controller.go b/cyclops-ctrl/internal/modulecontroller/module_controller.go
index 476371db..533efcdd 100644
--- a/cyclops-ctrl/internal/modulecontroller/module_controller.go
+++ b/cyclops-ctrl/internal/modulecontroller/module_controller.go
@@ -176,6 +176,16 @@ func (r *ModuleReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 
 	if len(installErrors) != 0 {
 		r.monitor.OnFailedReconciliation()
+
+		r.logger.Info("error applying resources",
+			"module namespaced name",
+			module.Name,
+			"number of install errors",
+			len(installErrors),
+			"install errors",
+			installErrors,
+		)
+
 		return ctrl.Result{}, r.setStatus(
 			ctx,
 			module,
@@ -305,15 +315,6 @@ func (r *ModuleReconciler) generateResources(
 		childrenGVRs = append(childrenGVRs, gvr)
 
 		if err := kClient.CreateDynamic(gvr, &obj, module.Spec.TargetNamespace); err != nil {
-			r.logger.Error(err, "could not apply resource",
-				"module namespaced name",
-				module.Name,
-				"gvk",
-				obj.GroupVersionKind().String(),
-				"resource namespaced name",
-				fmt.Sprintf("%s/%s", obj.GetNamespace(), obj.GetName()),
-			)
-
 			installErrors = append(installErrors, fmt.Sprintf(
 				"%v%v/%v %v/%v failed to apply: %v",
 				obj.GroupVersionKind().Group,
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/modules.go b/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
index db860a96..047c7ddd 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
@@ -67,9 +67,17 @@ func (k *KubernetesClient) GetResourcesForModule(name string) ([]dto.Resource, e
 
 	other := make([]unstructured.Unstructured, 0)
 	for _, gvr := range managedGVRs {
-		rs, err := k.Dynamic.Resource(gvr).List(context.Background(), metav1.ListOptions{
-			LabelSelector: "cyclops.module=" + name,
-		})
+		var rs *unstructured.UnstructuredList
+		if len(k.moduleTargetNamespace) > 0 {
+			rs, err = k.Dynamic.Resource(gvr).Namespace(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
+				LabelSelector: "cyclops.module=" + name,
+			})
+		} else {
+			rs, err = k.Dynamic.Resource(gvr).List(context.Background(), metav1.ListOptions{
+				LabelSelector: "cyclops.module=" + name,
+			})
+		}
+
 		if err != nil {
 			k.logger.Error(err, "failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
 			continue
@@ -111,7 +119,7 @@ func (k *KubernetesClient) GetResourcesForModule(name string) ([]dto.Resource, e
 func (k *KubernetesClient) GetWorkloadsForModule(name string) ([]dto.Resource, error) {
 	out := make([]dto.Resource, 0, 0)
 
-	deployments, err := k.clientset.AppsV1().Deployments("").List(context.Background(), metav1.ListOptions{
+	deployments, err := k.clientset.AppsV1().Deployments(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -128,7 +136,7 @@ func (k *KubernetesClient) GetWorkloadsForModule(name string) ([]dto.Resource, e
 		})
 	}
 
-	statefulset, err := k.clientset.AppsV1().StatefulSets("").List(context.Background(), metav1.ListOptions{
+	statefulset, err := k.clientset.AppsV1().StatefulSets(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -145,7 +153,7 @@ func (k *KubernetesClient) GetWorkloadsForModule(name string) ([]dto.Resource, e
 		})
 	}
 
-	daemonsets, err := k.clientset.AppsV1().DaemonSets("").List(context.Background(), metav1.ListOptions{
+	daemonsets, err := k.clientset.AppsV1().DaemonSets(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -295,7 +303,7 @@ func (k *KubernetesClient) GetDeletedResources(
 func (k *KubernetesClient) GetModuleResourcesHealth(name string) (string, error) {
 	resourcesWithHealth := 0
 
-	deployments, err := k.clientset.AppsV1().Deployments("").List(context.Background(), metav1.ListOptions{
+	deployments, err := k.clientset.AppsV1().Deployments(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -315,7 +323,7 @@ func (k *KubernetesClient) GetModuleResourcesHealth(name string) (string, error)
 		}
 	}
 
-	statefulsets, err := k.clientset.AppsV1().StatefulSets("").List(context.Background(), metav1.ListOptions{
+	statefulsets, err := k.clientset.AppsV1().StatefulSets(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -335,7 +343,7 @@ func (k *KubernetesClient) GetModuleResourcesHealth(name string) (string, error)
 		}
 	}
 
-	daemonsets, err := k.clientset.AppsV1().DaemonSets("").List(context.Background(), metav1.ListOptions{
+	daemonsets, err := k.clientset.AppsV1().DaemonSets(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -351,7 +359,7 @@ func (k *KubernetesClient) GetModuleResourcesHealth(name string) (string, error)
 		}
 	}
 
-	pvcs, err := k.clientset.CoreV1().PersistentVolumeClaims("").List(context.Background(), metav1.ListOptions{
+	pvcs, err := k.clientset.CoreV1().PersistentVolumeClaims(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {
@@ -365,7 +373,7 @@ func (k *KubernetesClient) GetModuleResourcesHealth(name string) (string, error)
 		}
 	}
 
-	pods, err := k.clientset.CoreV1().Pods("").List(context.Background(), metav1.ListOptions{
+	pods, err := k.clientset.CoreV1().Pods(k.moduleTargetNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: "cyclops.module=" + name,
 	})
 	if err != nil {

From 90b69e973e3a98eb55996057efcd1463cd675e3b Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 23:47:44 +0100
Subject: [PATCH 4/6] limit target namespaces

---
 cyclops-ctrl/internal/controller/cluster.go   | 11 ++++-----
 cyclops-ctrl/internal/controller/modules.go   |  2 +-
 cyclops-ctrl/pkg/cluster/k8sclient/helm.go    | 23 +++++++++++++------
 cyclops-ctrl/pkg/cluster/k8sclient/modules.go |  7 +++++-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/cyclops-ctrl/internal/controller/cluster.go b/cyclops-ctrl/internal/controller/cluster.go
index 87c2815a..cc94fbbf 100644
--- a/cyclops-ctrl/internal/controller/cluster.go
+++ b/cyclops-ctrl/internal/controller/cluster.go
@@ -1,7 +1,6 @@
 package controller
 
 import (
-	"fmt"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -27,7 +26,7 @@ func (c *Cluster) ListNodes(ctx *gin.Context) {
 
 	nodes, err := c.kubernetesClient.ListNodes()
 	if err != nil {
-		ctx.Status(http.StatusInternalServerError)
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching nodes", err.Error()))
 		return
 	}
 
@@ -48,15 +47,13 @@ func (c *Cluster) GetNode(ctx *gin.Context) {
 		return
 	}
 	if err != nil {
-		ctx.Status(http.StatusInternalServerError)
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching node", err.Error()))
 		return
 	}
 
 	pods, err := c.kubernetesClient.GetPodsForNode(nodeName)
 	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, dto.Error{
-			Message: fmt.Sprintf("Error listing pods for node: %v", nodeName),
-		})
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching pod nodes", err.Error()))
 		return
 	}
 
@@ -70,7 +67,7 @@ func (c *Cluster) ListNamespaces(ctx *gin.Context) {
 
 	namespaces, err := c.kubernetesClient.ListNamespaces()
 	if err != nil {
-		ctx.Status(http.StatusInternalServerError)
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching namespaces", err.Error()))
 		return
 	}
 
diff --git a/cyclops-ctrl/internal/controller/modules.go b/cyclops-ctrl/internal/controller/modules.go
index 9bff3d05..7e9afe08 100644
--- a/cyclops-ctrl/internal/controller/modules.go
+++ b/cyclops-ctrl/internal/controller/modules.go
@@ -58,7 +58,7 @@ func (m *Modules) GetModule(ctx *gin.Context) {
 	module, err := m.kubernetesClient.GetModule(ctx.Param("name"))
 	if err != nil {
 		fmt.Println(err)
-		ctx.Status(http.StatusInternalServerError)
+		ctx.JSON(http.StatusInternalServerError, dto.NewError("Error fetching module", err.Error()))
 		return
 	}
 
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/helm.go b/cyclops-ctrl/pkg/cluster/k8sclient/helm.go
index fe22e67e..e97debdd 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/helm.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/helm.go
@@ -38,19 +38,28 @@ func (k *KubernetesClient) GetResourcesForRelease(releaseName string) ([]dto.Res
 	}
 
 	other := make([]unstructured.Unstructured, 0)
+	listOptions := metav1.ListOptions{
+		LabelSelector: labels.Set(map[string]string{
+			"app.kubernetes.io/instance":   releaseName,
+			"app.kubernetes.io/managed-by": "Helm",
+		}).String(),
+	}
+
 	for _, gvr := range managedGVRs {
-		rs, err := k.Dynamic.Resource(gvr).Namespace(k.helmReleaseNamespace).List(context.Background(), metav1.ListOptions{
-			LabelSelector: labels.Set(map[string]string{
-				"app.kubernetes.io/instance":   releaseName,
-				"app.kubernetes.io/managed-by": "Helm",
-			}).String(),
-		})
+		var rs *unstructured.UnstructuredList
+		var err error
+		if len(k.helmReleaseNamespace) > 0 {
+			rs, err = k.Dynamic.Resource(gvr).Namespace(k.helmReleaseNamespace).List(context.Background(), listOptions)
+		} else {
+			rs, err = k.Dynamic.Resource(gvr).List(context.Background(), listOptions)
+		}
+
 		if err != nil {
 			if apierrors.IsNotFound(err) {
 				continue
 			}
 
-			k.logger.Error(err, "failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
+			k.logger.Info("failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
 			continue
 		}
 
diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/modules.go b/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
index 047c7ddd..fd3c4d33 100644
--- a/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
+++ b/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
@@ -12,6 +12,7 @@ import (
 	batchv1 "k8s.io/api/batch/v1"
 	apiv1 "k8s.io/api/core/v1"
 	networkingv1 "k8s.io/api/networking/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/labels"
@@ -79,7 +80,11 @@ func (k *KubernetesClient) GetResourcesForModule(name string) ([]dto.Resource, e
 		}
 
 		if err != nil {
-			k.logger.Error(err, "failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
+			if apierrors.IsNotFound(err) {
+				continue
+			}
+
+			k.logger.Info("error fetching resource", "gvr", gvr, "namespace", k.helmReleaseNamespace)
 			continue
 		}
 

From 54f48f9588b8ed6633c38d641577c9728c6f8b7e Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 23:49:37 +0100
Subject: [PATCH 5/6] limit target namespaces

---
 cyclops-ctrl/.env | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyclops-ctrl/.env b/cyclops-ctrl/.env
index 9bd119ab..0d1b23ee 100644
--- a/cyclops-ctrl/.env
+++ b/cyclops-ctrl/.env
@@ -1,6 +1,6 @@
 DISABLE_TELEMETRY=true
 PORT=8888
-WATCH_NAMESPACE=dobar
+WATCH_NAMESPACE=cyclops
 WATCH_NAMESPACE_HELM=
 CYCLOPS_VERSION=v0.0.0
-MODULE_TARGET_NAMESPACE=dobar
+MODULE_TARGET_NAMESPACE=

From 781340b36e432bb3ee5043a864ae7f64792497f7 Mon Sep 17 00:00:00 2001
From: petar-cvit <petar.cvitanovic@gmail.com>
Date: Mon, 4 Nov 2024 23:56:14 +0100
Subject: [PATCH 6/6] tests

---
 cyclops-ctrl/internal/controller/tests/cluster_test.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cyclops-ctrl/internal/controller/tests/cluster_test.go b/cyclops-ctrl/internal/controller/tests/cluster_test.go
index 477968ec..f39f3545 100644
--- a/cyclops-ctrl/internal/controller/tests/cluster_test.go
+++ b/cyclops-ctrl/internal/controller/tests/cluster_test.go
@@ -172,8 +172,8 @@ var _ = Describe("Cluster controller test", func() {
 
 				Expect(err).To(BeNil())
 				Expect(w.Code).To(BeEquivalentTo(http.StatusInternalServerError))
-				Expect(e.Message).To(BeEquivalentTo("Error listing pods for node: my-node"))
-				Expect(e.Description).To(BeEquivalentTo(""))
+				Expect(e.Message).To(BeEquivalentTo("Error fetching pod nodes"))
+				Expect(e.Description).To(BeEquivalentTo("nodes \"whereisit\" not found"))
 			})
 		})