feat(helm): share kubeconfig/context/namespace with Hel

Author: bussyjd

pkg/helm/helm.go

@@ -16,11 +16,19 @@ type Helm struct {
 	settings *cli.EnvSettings
 }
 
-// NewHelm creates a new Helm instance (optionally for a specific kubeconfig)
-func NewHelm() *Helm {
-	return &Helm{
-		settings: cli.New(),
+// NewHelm creates a new Helm instance using kubeconfig, context, and namespace settings
+func NewHelm(kubeconfig, kubeContext, namespace string) *Helm {
+	settings := cli.New()
+	if kubeconfig != "" {
+		settings.KubeConfig = kubeconfig
 	}
+	if kubeContext != "" {
+		settings.KubeContext = kubeContext
+	}
+	if namespace != "" {
+		settings.SetNamespace(namespace)
+	}
+	return &Helm{settings: settings}
 }
 
 // ReleasesList lists Helm releases in a specific namespace (or all namespaces if namespace is empty)

pkg/helm/helm_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestNewHelm(t *testing.T) {
-	h := NewHelm()
+	h := NewHelm("", "", "")
 	if h == nil {
 		t.Fatal("expected non-nil Helm instance")
 	}
@@ -16,7 +16,7 @@ func TestNewHelm(t *testing.T) {
 }
 
 func TestHelm_ReleasesList_DefaultNamespace(t *testing.T) {
-	h := NewHelm()
+	h := NewHelm("", "", "")
 	// Use a namespace that is likely to exist, or leave empty for default
 	releases, err := h.ReleasesList(context.Background(), "")
 	if err != nil {
@@ -29,7 +29,7 @@ func TestHelm_ReleasesList_DefaultNamespace(t *testing.T) {
 }
 
 func TestHelm_ReleasesList_AllNamespaces(t *testing.T) {
-	h := NewHelm()
+	h := NewHelm("", "", "")
 	releases, err := h.ReleasesList(context.Background(), "all")
 	if err != nil {
 		t.Skipf("skipping: could not list all releases (likely no cluster/helm configured): %v", err)

pkg/kubernetes/kubernetes.go

@@ -124,7 +124,27 @@ func marshal(v any) (string, error) {
 	return string(ret), nil
 }
 
-func (k *Kubernetes) configuredNamespace() string {
+// KubeconfigPath returns the kubeconfig path used by this Kubernetes client
+func (k *Kubernetes) KubeconfigPath() string {
+	return k.Kubeconfig
+}
+
+// CurrentContext returns the current context from the kubeconfig
+func (k *Kubernetes) CurrentContext() string {
+	if k.clientCmdConfig == nil {
+		return ""
+	}
+	if rawConfig, err := k.clientCmdConfig.RawConfig(); err == nil {
+		return rawConfig.CurrentContext
+	}
+	return ""
+}
+
+// ConfiguredNamespace returns the namespace configured in the kubeconfig/context
+func (k *Kubernetes) ConfiguredNamespace() string {
+	if k.clientCmdConfig == nil {
+		return ""
+	}
 	if ns, _, nsErr := k.clientCmdConfig.Namespace(); nsErr == nil {
 		return ns
 	}
@@ -133,7 +153,7 @@ func (k *Kubernetes) configuredNamespace() string {
 
 func (k *Kubernetes) namespaceOrDefault(namespace string) string {
 	if namespace == "" {
-		return k.configuredNamespace()
+		return k.ConfiguredNamespace()
 	}
 	return namespace
 }

pkg/kubernetes/resources.go

@@ -77,7 +77,7 @@ func (k *Kubernetes) resourcesList(ctx context.Context, gvk *schema.GroupVersion
 	// Check if operation is allowed for all namespaces (applicable for namespaced resources)
 	isNamespaced, _ := k.isNamespaced(gvk)
 	if isNamespaced && !k.canIUse(ctx, gvr, namespace, "list") && namespace == "" {
-		namespace = k.configuredNamespace()
+		namespace = k.ConfiguredNamespace()
 	}
 	return k.dynamicClient.Resource(*gvr).Namespace(namespace).List(ctx, metav1.ListOptions{})
 }

pkg/mcp/mcp.go

@@ -31,11 +31,17 @@ func NewSever(configuration Configuration) (*Server, error) {
 			server.WithToolCapabilities(true),
 			server.WithLogging(),
 		),
-		helm: helm.NewHelm(),
 	}
 	if err := s.reloadKubernetesClient(); err != nil {
 		return nil, err
 	}
+	// After Kubernetes client is initialized, set up Helm with the same config
+	if s.k != nil {
+		kubeconfig := s.k.KubeconfigPath()
+		kubeContext := s.k.CurrentContext()
+		namespace := s.k.ConfiguredNamespace()
+		s.helm = helm.NewHelm(kubeconfig, kubeContext, namespace)
+	}
 	s.k.WatchKubeConfig(s.reloadKubernetesClient)
 	return s, nil
 }