fix: propagate MCPServer CRD timeout to RemoteMCPServer with 30s default

Author: skhedim

go/go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jedib0t/go-pretty/v6 v6.7.8
-	github.com/kagent-dev/kmcp v0.2.5
+	github.com/kagent-dev/kmcp v0.2.6-0.20260210193153-3ba0e2e7f39d
 	github.com/kagent-dev/mockllm v0.0.3
 	github.com/modelcontextprotocol/go-sdk v1.2.0
 	github.com/muesli/reflow v0.3.0
@@ -184,5 +184,3 @@ require (
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
 )
-
-replace github.com/kagent-dev/kmcp => github.com/skhedim/kmcp v0.0.0-20260210142932-adddd74a3846

go/go.sum

@@ -165,6 +165,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/kagent-dev/kmcp v0.2.6-0.20260210193153-3ba0e2e7f39d h1:+BN03C8JGZIJ3uMNBopXcNROHpPQdovffYQhY+toBHU=
+github.com/kagent-dev/kmcp v0.2.6-0.20260210193153-3ba0e2e7f39d/go.mod h1:g7wS/3m2wonRo/1DMwVoHxnilr/urPgV2hwV1DwkwrQ=
 github.com/kagent-dev/mockllm v0.0.3 h1:hk6Oa/vxHoBrGqRig4GCzox8EqRQYXM4c3oFPP/k9Tg=
 github.com/kagent-dev/mockllm v0.0.3/go.mod h1:tDLemRsTZa1NdHaDbg3sgFk9cT1QWvMPlBtLVD6I2mA=
 github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
@@ -258,8 +260,6 @@ github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
 github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
 github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
 github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/skhedim/kmcp v0.0.0-20260210142932-adddd74a3846 h1:sCj20Ly5evtO5aWd0PS9rhlHl9xGzA2yJc5k/Ljz3gA=
-github.com/skhedim/kmcp v0.0.0-20260210142932-adddd74a3846/go.mod h1:g7wS/3m2wonRo/1DMwVoHxnilr/urPgV2hwV1DwkwrQ=
 github.com/spf13/afero v1.15.0 h1:b/YBCLWAJdFWJTN9cLhiXXcD7mzKn9Dm86dNnfyQw1I=
 github.com/spf13/afero v1.15.0/go.mod h1:NC2ByUVxtQs4b3sIUphxK0NioZnmxgyCrfzeuq8lxMg=
 github.com/spf13/cast v1.10.0 h1:h2x0u2shc1QuLHfxi+cTJvs30+ZAHOGRic8uyGTDWxY=

go/internal/controller/translator/agent/adk_api_translator.go

@@ -14,6 +14,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"time"
 
 	"github.com/kagent-dev/kagent/go/api/v1alpha2"
 	"github.com/kagent-dev/kagent/go/internal/adk"
@@ -1271,10 +1272,14 @@ func ConvertMCPServerToRemoteMCPServer(mcpServer *v1alpha1.MCPServer) (*v1alpha2
 		},
 	}
 
-	// Propagate the timeout from the MCPServer CRD (which has a kubebuilder
-	// default of "30s") to the generated RemoteMCPServer spec.
+	// Propagate the timeout from the MCPServer CRD to the generated
+	// RemoteMCPServer spec. Fall back to 30s for MCPServer objects created
+	// before the CRD default was introduced, so the ADK never uses its own
+	// 5s default which is too short for sidecar gateway cold starts.
 	if mcpServer.Spec.Timeout != nil {
 		remoteMCP.Spec.Timeout = mcpServer.Spec.Timeout
+	} else {
+		remoteMCP.Spec.Timeout = &metav1.Duration{Duration: 30 * time.Second}
 	}
 
 	return remoteMCP, nil

go/internal/controller/translator/agent/testdata/inputs/agent_with_proxy_mcpserver_custom_timeout.yaml

@@ -0,0 +1,49 @@
+operation: translateAgent
+targetObject: agent-with-proxy-mcpserver-timeout
+namespace: test
+proxyURL: http://proxy.kagent.svc.cluster.local:8080
+objects:
+  - apiVersion: v1
+    kind: Secret
+    metadata:
+      name: openai-secret
+      namespace: test
+    data:
+      api-key: c2stdGVzdC1hcGkta2V5  # base64 encoded "sk-test-api-key"
+  - apiVersion: kagent.dev/v1alpha2
+    kind: ModelConfig
+    metadata:
+      name: default-model
+      namespace: test
+    spec:
+      provider: OpenAI
+      model: gpt-4o
+      apiKeySecret: openai-secret
+      apiKeySecretKey: api-key
+  - apiVersion: kagent.dev/v1alpha1
+    kind: MCPServer
+    metadata:
+      name: test-mcp-server
+      namespace: test
+    spec:
+      deployment:
+        port: 8084
+      timeout: 60s
+  - apiVersion: kagent.dev/v1alpha2
+    kind: Agent
+    metadata:
+      name: agent-with-proxy-mcpserver-timeout
+      namespace: test
+    spec:
+      type: Declarative
+      declarative:
+        description: An agent with proxy configuration and MCPServer with custom timeout
+        systemMessage: You are an agent that uses proxies.
+        modelConfig: default-model
+        tools:
+          - type: MCPServer
+            mcpServer:
+              name: test-mcp-server
+              kind: MCPServer
+              toolNames:
+                - test-tool

go/internal/controller/translator/agent/testdata/outputs/agent_with_allowed_headers.json

@@ -172,6 +172,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {

go/internal/controller/translator/agent/testdata/outputs/agent_with_code.json

@@ -164,6 +164,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {

go/internal/controller/translator/agent/testdata/outputs/agent_with_cross_namespace_tools.json

@@ -177,6 +177,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {

go/internal/controller/translator/agent/testdata/outputs/agent_with_custom_sa.json

@@ -132,6 +132,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {

go/internal/controller/translator/agent/testdata/outputs/agent_with_http_toolserver.json

@@ -171,6 +171,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {

go/internal/controller/translator/agent/testdata/outputs/agent_with_mcp_service.json

@@ -167,6 +167,10 @@
                       }
                     }
                   },
+                  {
+                    "name": "OTEL_EXPORTER_OTLP_METRICS_TEMPORALITY_PREFERENCE",
+                    "value": "delta"
+                  },
                   {
                     "name": "KAGENT_NAMESPACE",
                     "valueFrom": {