App page secrets error

core/server/helm_release.go

@@ -1,81 +1,25 @@
 package server
 
 import (
-	"bytes"
-	"compress/gzip"
 	"context"
-	"encoding/base64"
-	"encoding/json"
 	"fmt"
-	"io"
 	"strings"
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
-	"github.com/fluxcd/pkg/ssa"
 	"github.com/weaveworks/weave-gitops/core/clustersmngr"
-	"github.com/weaveworks/weave-gitops/core/server/types"
 	pb "github.com/weaveworks/weave-gitops/pkg/api/core"
-	v1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func getHelmReleaseInventory(ctx context.Context, helmRelease helmv2.HelmRelease, c clustersmngr.Client, cluster string) ([]*pb.GroupVersionKind, error) {
-	storageNamespace := helmRelease.GetStorageNamespace()
-
-	storageName := helmRelease.GetReleaseName()
-
-	storageVersion := helmRelease.Status.LastReleaseRevision
-	if storageVersion < 1 {
-		// skip release if it failed to install
-		return nil, nil
-	}
-
-	storageSecret := &v1.Secret{}
-	secretName := fmt.Sprintf("sh.helm.release.v1.%s.v%v", storageName, storageVersion)
-	key := client.ObjectKey{
-		Name:      secretName,
-		Namespace: storageNamespace,
-	}
-
-	if err := c.Get(ctx, cluster, key, storageSecret); err != nil {
-		return nil, err
-	}
-
-	releaseData, releaseFound := storageSecret.Data["release"]
-	if !releaseFound {
-		return nil, fmt.Errorf("failed to decode the Helm storage object for HelmRelease '%s'", helmRelease.Name)
-	}
-
-	byteData, err := base64.StdEncoding.DecodeString(string(releaseData))
+	k8sClient, err := c.Scoped(cluster)
 	if err != nil {
-		return nil, err
-	}
-
-	var magicGzip = []byte{0x1f, 0x8b, 0x08}
-	if bytes.Equal(byteData[0:3], magicGzip) {
-		r, err := gzip.NewReader(bytes.NewReader(byteData))
-		if err != nil {
-			return nil, err
-		}
-
-		defer r.Close()
-
-		uncompressedByteData, err := io.ReadAll(r)
-		if err != nil {
-			return nil, err
-		}
-
-		byteData = uncompressedByteData
+		return nil, fmt.Errorf("error getting scoped client for cluster=%s: %w", cluster, err)
 	}
 
-	storage := types.HelmReleaseStorage{}
-	if err := json.Unmarshal(byteData, &storage); err != nil {
-		return nil, fmt.Errorf("failed to decode the Helm storage object for HelmRelease '%s': %w", helmRelease.Name, err)
-	}
+	objects, err := getHelmReleaseObjects(ctx, k8sClient, &helmRelease)
 
-	objects, err := ssa.ReadObjects(strings.NewReader(storage.Manifest))
 	if err != nil {
-		return nil, fmt.Errorf("failed to read the Helm storage object for HelmRelease '%s': %w", helmRelease.Name, err)
+		return nil, err
 	}
 
 	var gvk []*pb.GroupVersionKind

core/server/inventory.go

@@ -195,6 +195,11 @@ func getHelmReleaseObjects(ctx context.Context, k8sClient client.Client, helmRel
 		Namespace: storageNamespace,
 	}
 
+	if helmRelease.Spec.KubeConfig != nil {
+		// helmrelease secret is on another cluster so we cannot inspect it to figure out the inventory and version and other things
+		return nil, nil
+	}
+
 	if err := k8sClient.Get(ctx, key, storageSecret); err != nil {
 		return nil, err
 	}

core/server/inventory_test.go

@@ -9,6 +9,7 @@ import (
 
 	helmv2 "github.com/fluxcd/helm-controller/api/v2beta1"
 	kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
+	"github.com/fluxcd/pkg/apis/meta"
 	sourcev1 "github.com/fluxcd/source-controller/api/v1"
 	. "github.com/onsi/gomega"
 	"github.com/weaveworks/weave-gitops/core/clustersmngr/cluster"
@@ -270,3 +271,63 @@ func TestGetInventoryHelmRelease(t *testing.T) {
 	g.Expect(err).NotTo(HaveOccurred())
 	g.Expect(res.Entries).To(HaveLen(1))
 }
+
+func TestGetInventoryHelmReleaseWithKubeconfig(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	scheme, err := kube.CreateScheme()
+	g.Expect(err).NotTo(HaveOccurred())
+
+	ctx := context.Background()
+
+	ns := &corev1.Namespace{
+		ObjectMeta: metav1.ObjectMeta{
+			Name: "test-namespace",
+		},
+	}
+	helm1 := &helmv2.HelmRelease{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "first-helm-name",
+			Namespace: ns.Name,
+		},
+		Spec: helmv2.HelmReleaseSpec{
+			KubeConfig: &meta.KubeConfigReference{
+				SecretRef: meta.SecretKeyReference{
+					Name: "kubeconfig",
+				},
+			},
+		},
+		Status: helmv2.HelmReleaseStatus{
+			LastReleaseRevision: 1,
+		},
+	}
+
+	cm := &corev1.ConfigMap{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "ConfigMap",
+			APIVersion: "v1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "config-map",
+			Namespace: ns.Name,
+		},
+		Data: map[string]string{
+			"key": "value",
+		},
+	}
+
+	client := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(ns, helm1, cm).Build()
+	cfg := makeServerConfig(client, t, "")
+	c := makeServer(cfg, t)
+
+	res, err := c.GetInventory(ctx, &pb.GetInventoryRequest{
+		Namespace:    ns.Name,
+		ClusterName:  cluster.DefaultCluster,
+		Kind:         "HelmRelease",
+		Name:         helm1.Name,
+		WithChildren: true,
+	})
+
+	g.Expect(err).NotTo(HaveOccurred())
+	g.Expect(res.Entries).To(HaveLen(0))
+}