Namespaced resource fetching (#671)

* set k8s client namespace * scope resource fetching * scope resource fetching * ckip not found
cyclops-ui · Nov 4, 2024 · b078490 · b078490
1 parent 4889673
commit b078490
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/cyclops-ctrl/cmd/main/main.go b/cyclops-ctrl/cmd/main/main.go
@@ -72,8 +72,9 @@ func main() {
 	telemetryClient.InstanceStart()
 
 	watchNamespace := getWatchNamespace()
+	helmWatchNamespace := getHelmWatchNamespace()
 
-	k8sClient, err := k8sclient.New(watchNamespace)
+	k8sClient, err := k8sclient.New(watchNamespace, helmWatchNamespace, zap.New(zap.UseFlagOptions(&opts)))
 	if err != nil {
 		fmt.Println("error bootstrapping Kubernetes client", err)
 		panic(err)
@@ -93,7 +94,7 @@ func main() {
 
 	prometheus.StartCacheMetricsUpdater(&monitor, templatesRepo.ReturnCache(), 10*time.Second, setupLog)
 
-	helmReleaseClient := helm.NewReleaseClient(getHelmWatchNamespace())
+	helmReleaseClient := helm.NewReleaseClient(helmWatchNamespace)
 
 	handler, err := handler.New(templatesRepo, k8sClient, helmReleaseClient, renderer, telemetryClient, monitor)
 	if err != nil {

diff --git a/cyclops-ctrl/internal/integrations/helm/helm.go b/cyclops-ctrl/internal/integrations/helm/helm.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"io"
 	"log"
-	"path"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -104,7 +103,6 @@ func (r *ReleaseClient) UpgradeRelease(
 	client.SetRegistryClient(registryClient)
 
 	for _, dependency := range current.Chart.Metadata.Dependencies {
-		fmt.Println(dependency.Repository, dependency.Name, path.Join(dependency.Repository, dependency.Name))
 		fp, err := client.LocateChart(dependency.Repository+"/"+dependency.Name, cli.New())
 		if err != nil {
 			return errors.Wrap(err, "failed to locate dependency chart")

diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/client.go b/cyclops-ctrl/pkg/cluster/k8sclient/client.go
@@ -3,6 +3,7 @@ package k8sclient
 import (
 	"context"
 
+	"github.com/go-logr/logr"
 	apiv1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
@@ -19,14 +20,17 @@ import (
 )
 
 type KubernetesClient struct {
-	Dynamic         dynamic.Interface
-	clientset       *kubernetes.Clientset
-	discovery       *discovery.DiscoveryClient
-	moduleset       *client.CyclopsV1Alpha1Client
-	moduleNamespace string
+	Dynamic              dynamic.Interface
+	clientset            *kubernetes.Clientset
+	discovery            *discovery.DiscoveryClient
+	moduleset            *client.CyclopsV1Alpha1Client
+	moduleNamespace      string
+	helmReleaseNamespace string
+
+	logger logr.Logger
 }
 
-func New(moduleNamespace string) (*KubernetesClient, error) {
+func New(moduleNamespace, helmReleaseNamespace string, logger logr.Logger) (*KubernetesClient, error) {
 	config := ctrl.GetConfigOrDie()
 	clientset, err := kubernetes.NewForConfig(config)
 	if err != nil {
@@ -46,11 +50,13 @@ func New(moduleNamespace string) (*KubernetesClient, error) {
 	}
 
 	return &KubernetesClient{
-		Dynamic:         dynamic,
-		discovery:       discovery,
-		clientset:       clientset,
-		moduleset:       moduleSet,
-		moduleNamespace: moduleNamespace,
+		Dynamic:              dynamic,
+		discovery:            discovery,
+		clientset:            clientset,
+		moduleset:            moduleSet,
+		moduleNamespace:      moduleNamespace,
+		helmReleaseNamespace: helmReleaseNamespace,
+		logger:               logger,
 	}, nil
 }
 

diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/helm.go b/cyclops-ctrl/pkg/cluster/k8sclient/helm.go
@@ -2,12 +2,15 @@ package k8sclient
 
 import (
 	"context"
-	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
+	"sort"
+
+	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"
 	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sort"
+
+	"github.com/cyclops-ui/cyclops/cyclops-ctrl/internal/models/dto"
 )
 
 func (k *KubernetesClient) GetResourcesForRelease(releaseName string) ([]dto.Resource, error) {
@@ -36,13 +39,18 @@ func (k *KubernetesClient) GetResourcesForRelease(releaseName string) ([]dto.Res
 
 	other := make([]unstructured.Unstructured, 0)
 	for _, gvr := range managedGVRs {
-		rs, err := k.Dynamic.Resource(gvr).List(context.Background(), metav1.ListOptions{
+		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(),
 		})
 		if err != nil {
+			if apierrors.IsNotFound(err) {
+				continue
+			}
+
+			k.logger.Error(err, "failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
 			continue
 		}
 
@@ -82,7 +90,7 @@ func (k *KubernetesClient) GetResourcesForRelease(releaseName string) ([]dto.Res
 func (k *KubernetesClient) GetWorkloadsForRelease(releaseName 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.helmReleaseNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: labels.Set(map[string]string{
 			"app.kubernetes.io/instance":   releaseName,
 			"app.kubernetes.io/managed-by": "Helm",
@@ -102,7 +110,7 @@ func (k *KubernetesClient) GetWorkloadsForRelease(releaseName string) ([]dto.Res
 		})
 	}
 
-	statefulset, err := k.clientset.AppsV1().StatefulSets("").List(context.Background(), metav1.ListOptions{
+	statefulset, err := k.clientset.AppsV1().StatefulSets(k.helmReleaseNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: labels.Set(map[string]string{
 			"app.kubernetes.io/instance":   releaseName,
 			"app.kubernetes.io/managed-by": "Helm",
@@ -122,7 +130,7 @@ func (k *KubernetesClient) GetWorkloadsForRelease(releaseName string) ([]dto.Res
 		})
 	}
 
-	daemonsets, err := k.clientset.AppsV1().DaemonSets("").List(context.Background(), metav1.ListOptions{
+	daemonsets, err := k.clientset.AppsV1().DaemonSets(k.helmReleaseNamespace).List(context.Background(), metav1.ListOptions{
 		LabelSelector: labels.Set(map[string]string{
 			"app.kubernetes.io/instance":   releaseName,
 			"app.kubernetes.io/managed-by": "Helm",

diff --git a/cyclops-ctrl/pkg/cluster/k8sclient/modules.go b/cyclops-ctrl/pkg/cluster/k8sclient/modules.go
@@ -71,6 +71,7 @@ func (k *KubernetesClient) GetResourcesForModule(name string) ([]dto.Resource, e
 			LabelSelector: "cyclops.module=" + name,
 		})
 		if err != nil {
+			k.logger.Error(err, "failed to list resources", "gvr", gvr, "namespace", k.helmReleaseNamespace)
 			continue
 		}