limit target namespaces

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
 	}
 

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
 	}
 

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
 		}
 

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
 		}