Skip to content

fix(helm): helm logs to klog #487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 21, 2025
+35 −9
Merged

fix(helm): helm logs to klog #487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions pkg/helm/helm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@ package helm
import (
"context"
"fmt"
"time"

"helm.sh/helm/v3/pkg/action"
"helm.sh/helm/v3/pkg/chart/loader"
"helm.sh/helm/v3/pkg/cli"
"helm.sh/helm/v3/pkg/registry"
"helm.sh/helm/v3/pkg/release"
"k8s.io/cli-runtime/pkg/genericclioptions"
"log"
"k8s.io/klog/v2"
"sigs.k8s.io/yaml"
"time"
)

type Kubernetes interface {
Expand Down Expand Up @@ -115,7 +116,7 @@ func (h *Helm) newAction(namespace string, allNamespaces bool) (*action.Configur
return nil, err
}
cfg.RegistryClient = registryClient
return cfg, cfg.Init(h.kubernetes, applicableNamespace, "", log.Printf)
return cfg, cfg.Init(h.kubernetes, applicableNamespace, "", klog.V(5).Infof)
}

func simplify(release ...*release.Release) []map[string]interface{} {
Expand Down
37 changes: 31 additions & 6 deletions pkg/mcp/helm_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
package mcp

import (
"bytes"
"context"
"encoding/base64"
"flag"
"path/filepath"
"runtime"
"strconv"
"strings"
"testing"

Expand All @@ -15,16 +18,32 @@ import (
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/klog/v2"
"k8s.io/klog/v2/textlogger"
"sigs.k8s.io/yaml"
)

type HelmSuite struct {
BaseMcpSuite
klogState klog.State
logBuffer bytes.Buffer
}

func (s *HelmSuite) SetupTest() {
s.BaseMcpSuite.SetupTest()
clearHelmReleases(s.T().Context(), kubernetes.NewForConfigOrDie(envTestRestConfig))

// Capture log output to verify denied resource messages
s.klogState = klog.CaptureState()
flags := flag.NewFlagSet("test", flag.ContinueOnError)
klog.InitFlags(flags)
_ = flags.Set("v", strconv.Itoa(5))
klog.SetLogger(textlogger.NewLogger(textlogger.NewConfig(textlogger.Verbosity(5), textlogger.Output(&s.logBuffer))))
}

func (s *HelmSuite) TearDownTest() {
s.BaseMcpSuite.TearDownTest()
s.klogState.Restore()
}

func (s *HelmSuite) TestHelmInstall() {
Expand Down Expand Up @@ -234,7 +253,7 @@ func (s *HelmSuite) TestHelmUninstall() {

func (s *HelmSuite) TestHelmUninstallDenied() {
s.Require().NoError(toml.Unmarshal([]byte(`
denied_resources = [ { version = "v1", kind = "Secret" } ]
denied_resources = [ { version = "v1", kind = "ConfigMap" } ]
`), s.Cfg), "Expected to parse denied resources config")
kc := kubernetes.NewForConfigOrDie(envTestRestConfig)
_, err := kc.CoreV1().Secrets("default").Create(s.T().Context(), &corev1.Secret{
Expand All @@ -246,7 +265,7 @@ func (s *HelmSuite) TestHelmUninstallDenied() {
"release": []byte(base64.StdEncoding.EncodeToString([]byte("{" +
"\"name\":\"existent-release-to-uninstall\"," +
"\"info\":{\"status\":\"deployed\"}," +
"\"manifest\":\"apiVersion: v1\\nkind: Secret\\nmetadata:\\n name: secret-to-deny\\n namespace: default\\n\"" +
"\"manifest\":\"apiVersion: v1\\nkind: ConfigMap\\nmetadata:\\n name: config-map-to-deny\\n namespace: default\\n\"" +
"}"))),
},
}, metav1.CreateOptions{})
Expand All @@ -260,10 +279,16 @@ func (s *HelmSuite) TestHelmUninstallDenied() {
s.Truef(toolResult.IsError, "call tool should fail")
s.Nilf(err, "call tool should not return error object")
})
s.Run("describes denial", func() {
s.T().Skipf("Helm won't report what underlying resource caused the failure, so we can't assert on it")
expectedMessage := "failed to uninstall release:(.+:)? resource not allowed: /v1, Kind=Secret"
s.Regexpf(expectedMessage, toolResult.Content[0].(mcp.TextContent).Text, "expected descriptive error '%s', got %v", expectedMessage, toolResult.Content[0].(mcp.TextContent).Text)
s.Run("describes failure to uninstall", func() {
s.Contains(toolResult.Content[0].(mcp.TextContent).Text,
"failed to uninstall helm chart 'existent-release-to-uninstall': failed to delete release: existent-release-to-uninstall")
})
s.Run("describes denial (in log)", func() {
msg := s.logBuffer.String()
s.Contains(msg, "resource not allowed:")
expectedMessage := "uninstall: Failed to delete release:(.+:)? resource not allowed: /v1, Kind=ConfigMap"
s.Regexpf(expectedMessage, msg,
"expected descriptive error '%s', got %v", expectedMessage, msg)
})
})
}
Expand Down