From 77f069af206d3f6f7bfe787cc2c6fff45ae59112 Mon Sep 17 00:00:00 2001
From: Lucas Barros <lucasbarros.kam@gmail.com>
Date: Sat, 14 Nov 2026 06:20:52 -0300
Subject: [PATCH] fix(helm): let helm_upgrade callers set the --timeout

helm_upgrade always ran helm with --timeout 30s. With wait set, helm
gives up after 30s on resources that are still becoming ready (an
image pull is often longer), marks the release failed and the tool
returns an error. Add a timeout input; 30s stays the default.

Signed-off-by: Lucas Barros <lucasbarros.kam@gmail.com>
---
 pkg/helm/helm.go      | 25 ++++++++++++++++++++++---
 pkg/helm/helm_test.go | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/pkg/helm/helm.go b/pkg/helm/helm.go
index ff31dc1..5b7d700 100644
--- a/pkg/helm/helm.go
+++ b/pkg/helm/helm.go
@@ -93,17 +93,26 @@ func handleHelmListReleases(ctx context.Context, request *sdkmcp.CallToolRequest
 	return mcp.TextResult(result)
 }
 
+// defaultUpgradeTimeout is the --timeout passed to helm upgrade when the
+// caller does not set one
+const defaultUpgradeTimeout = 30 * time.Second
+
 func runHelmCommand(ctx context.Context, args []string) (string, error) {
+	return runHelmCommandWithTimeout(ctx, args, defaultUpgradeTimeout)
+}
+
+// runHelmCommandWithTimeout runs helm, passing upgradeTimeout as --timeout to
+// upgrade commands.
+func runHelmCommandWithTimeout(ctx context.Context, args []string, upgradeTimeout time.Duration) (string, error) {
 	kubeconfigPath := utils.GetKubeconfig()
 
-	// Add timeout for helm upgrade commands
 	cmdBuilder := commands.NewCommandBuilder("helm").
 		WithArgs(args...).
 		WithKubeconfig(kubeconfigPath)
 
 	// Only add timeout for upgrade commands
 	if len(args) > 0 && args[0] == "upgrade" {
-		cmdBuilder = cmdBuilder.WithTimeout(30 * time.Second)
+		cmdBuilder = cmdBuilder.WithTimeout(upgradeTimeout)
 	}
 
 	result, err := cmdBuilder.Execute(ctx)
@@ -162,6 +171,7 @@ type helmUpgradeReleaseInput struct {
 	Install   bool   `json:"install" jsonschema:"Run an install if the release is not present"`
 	DryRun    bool   `json:"dry_run" jsonschema:"Simulate an upgrade"`
 	Wait      bool   `json:"wait" jsonschema:"Wait for the upgrade to complete"`
+	Timeout   string `json:"timeout,omitempty" jsonschema:"How long helm waits for the upgrade, its hooks and, with wait, the resources to become ready (Go duration, e.g. '5m'). Defaults to 30s"`
 }
 
 // Helm upgrade release
@@ -189,6 +199,15 @@ func handleHelmUpgradeRelease(ctx context.Context, request *sdkmcp.CallToolReque
 		}
 	}
 
+	timeout := defaultUpgradeTimeout
+	if in.Timeout != "" {
+		parsed, err := time.ParseDuration(in.Timeout)
+		if err != nil || parsed <= 0 {
+			return mcp.TextError(fmt.Sprintf("Invalid timeout %q: must be a positive duration such as 5m", in.Timeout))
+		}
+		timeout = parsed
+	}
+
 	args := []string{"upgrade", in.Name, in.Chart}
 
 	if in.Namespace != "" {
@@ -223,7 +242,7 @@ func handleHelmUpgradeRelease(ctx context.Context, request *sdkmcp.CallToolReque
 		args = append(args, "--wait")
 	}
 
-	result, err := runHelmCommand(ctx, args)
+	result, err := runHelmCommandWithTimeout(ctx, args, timeout)
 	if err != nil {
 		return mcp.TextError(fmt.Sprintf("Helm upgrade command failed: %v", err))
 	}
diff --git a/pkg/helm/helm_test.go b/pkg/helm/helm_test.go
index 2c2923c..2345f53 100644
--- a/pkg/helm/helm_test.go
+++ b/pkg/helm/helm_test.go
@@ -286,6 +286,45 @@ REVISION: 2`
 	})
 }
 
+func TestHandleHelmUpgradeReleaseTimeout(t *testing.T) {
+	t.Run("upgrade with wait and timeout", func(t *testing.T) {
+		mock := cmd.NewMockShellExecutor()
+		expectedArgs := []string{"upgrade", "myapp", "stable/myapp", "--wait", "--timeout", "5m0s"}
+		mock.AddCommandString("helm", expectedArgs, "Upgraded", nil)
+		ctx := cmd.WithShellExecutor(context.Background(), mock)
+
+		result, _, err := handleHelmUpgradeRelease(ctx, &sdkmcp.CallToolRequest{}, helmUpgradeReleaseInput{
+			Name:    "myapp",
+			Chart:   "stable/myapp",
+			Wait:    true,
+			Timeout: "5m",
+		})
+
+		assert.NoError(t, err)
+		assert.False(t, result.IsError)
+		callLog := mock.GetCallLog()
+		require.Len(t, callLog, 1)
+		assert.Equal(t, expectedArgs, callLog[0].Args)
+	})
+
+	t.Run("upgrade with invalid timeout", func(t *testing.T) {
+		mock := cmd.NewMockShellExecutor()
+		ctx := cmd.WithShellExecutor(context.Background(), mock)
+
+		for _, timeout := range []string{"soon", "0s", "-1m"} {
+			result, _, err := handleHelmUpgradeRelease(ctx, &sdkmcp.CallToolRequest{}, helmUpgradeReleaseInput{
+				Name:    "myapp",
+				Chart:   "stable/myapp",
+				Timeout: timeout,
+			})
+			assert.NoError(t, err)
+			assert.True(t, result.IsError, timeout)
+			assert.Contains(t, getResultText(result), "Invalid timeout")
+		}
+		assert.Len(t, mock.GetCallLog(), 0)
+	})
+}
+
 // Test Helm Uninstall
 func TestHandleHelmUninstall(t *testing.T) {
 	t.Run("basic uninstall", func(t *testing.T) {