Rebased with lastest main

Author: ngopalak-redhat

pkg/kubernetes/nodes.go

@@ -12,6 +12,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/rand"
 	"k8s.io/client-go/tools/remotecommand"
 	"k8s.io/metrics/pkg/apis/metrics"
@@ -169,7 +170,7 @@ func (k *Kubernetes) NodesFiles(ctx context.Context, opts NodeFilesOptions) (str
 	}
 
 	// Create the pod
-	pods, err := k.manager.accessControlClientSet.Pods(opts.Namespace)
+	pods, err := k.AccessControlClientset().Pods(opts.Namespace)
 	if err != nil {
 		return "", fmt.Errorf("failed to get pods client: %w", err)
 	}
@@ -288,7 +289,26 @@ func (k *Kubernetes) execInPod(ctx context.Context, namespace, podName string, c
 		Stderr:    true,
 	}
 
-	executor, err := k.manager.accessControlClientSet.PodsExec(namespace, podName, podExecOptions)
+	// Compute URL
+	execRequest := k.AccessControlClientset().CoreV1().RESTClient().
+		Post().
+		Resource("pods").
+		Namespace(namespace).
+		Name(podName).
+		SubResource("exec")
+	execRequest.VersionedParams(podExecOptions, ParameterCodec)
+
+	spdyExec, err := remotecommand.NewSPDYExecutor(k.AccessControlClientset().cfg, "POST", execRequest.URL())
+	if err != nil {
+		return "", err
+	}
+	webSocketExec, err := remotecommand.NewWebSocketExecutor(k.AccessControlClientset().cfg, "GET", execRequest.URL().String())
+	if err != nil {
+		return "", err
+	}
+	executor, err := remotecommand.NewFallbackExecutor(webSocketExec, spdyExec, func(err error) bool {
+		return httpstream.IsUpgradeFailure(err) || httpstream.IsHTTPSProxyError(err)
+	})
 	if err != nil {
 		return "", err
 	}
@@ -316,7 +336,7 @@ func (k *Kubernetes) execInPod(ctx context.Context, namespace, podName string, c
 
 // waitForPodReady waits for a pod to be ready
 func (k *Kubernetes) waitForPodReady(ctx context.Context, namespace, podName string, timeout time.Duration) error {
-	pods, err := k.manager.accessControlClientSet.Pods(namespace)
+	pods, err := k.AccessControlClientset().Pods(namespace)
 	if err != nil {
 		return err
 	}

pkg/mcp/testdata/toolsets-core-tools.json

@@ -34,9 +34,7 @@
   {
     "annotations": {
       "title": "Node: Files",
-      "readOnlyHint": false,
       "destructiveHint": true,
-      "idempotentHint": false,
       "openWorldHint": true
     },
     "description": "Perform file operations (put, get, list) on a Kubernetes node filesystem by creating a privileged pod. WARNING: Requires privileged access to the node. This tool creates a temporary privileged pod that mounts the node's root filesystem to perform file operations. The pod is automatically deleted after the operation completes.",

pkg/mcp/testdata/toolsets-full-tools-multicluster-enum.json

@@ -191,9 +191,7 @@
   {
     "annotations": {
       "title": "Node: Files",
-      "readOnlyHint": false,
       "destructiveHint": true,
-      "idempotentHint": false,
       "openWorldHint": true
     },
     "description": "Perform file operations (put, get, list) on a Kubernetes node filesystem by creating a privileged pod. WARNING: Requires privileged access to the node. This tool creates a temporary privileged pod that mounts the node's root filesystem to perform file operations. The pod is automatically deleted after the operation completes.",
@@ -277,7 +275,7 @@
           "type": "string"
         },
         "query": {
-          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/<log-file-name>\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
+          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/\u003clog-file-name\u003e\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
           "type": "string"
         },
         "tailLines": {
@@ -874,4 +872,4 @@
     },
     "name": "resources_scale"
   }
-]
+]

pkg/mcp/testdata/toolsets-full-tools-multicluster.json

@@ -171,9 +171,7 @@
   {
     "annotations": {
       "title": "Node: Files",
-      "readOnlyHint": false,
       "destructiveHint": true,
-      "idempotentHint": false,
       "openWorldHint": true
     },
     "description": "Perform file operations (put, get, list) on a Kubernetes node filesystem by creating a privileged pod. WARNING: Requires privileged access to the node. This tool creates a temporary privileged pod that mounts the node's root filesystem to perform file operations. The pod is automatically deleted after the operation completes.",
@@ -249,7 +247,7 @@
           "type": "string"
         },
         "query": {
-          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/<log-file-name>\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
+          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/\u003clog-file-name\u003e\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
           "type": "string"
         },
         "tailLines": {
@@ -786,4 +784,4 @@
     },
     "name": "resources_scale"
   }
-]
+]

pkg/mcp/testdata/toolsets-full-tools-openshift.json

@@ -135,9 +135,7 @@
   {
     "annotations": {
       "title": "Node: Files",
-      "readOnlyHint": false,
       "destructiveHint": true,
-      "idempotentHint": false,
       "openWorldHint": true
     },
     "description": "Perform file operations (put, get, list) on a Kubernetes node filesystem by creating a privileged pod. WARNING: Requires privileged access to the node. This tool creates a temporary privileged pod that mounts the node's root filesystem to perform file operations. The pod is automatically deleted after the operation completes.",
@@ -205,7 +203,7 @@
           "type": "string"
         },
         "query": {
-          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/<log-file-name>\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
+          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/\u003clog-file-name\u003e\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
           "type": "string"
         },
         "tailLines": {
@@ -695,4 +693,4 @@
     },
     "name": "resources_scale"
   }
-]
+]

pkg/mcp/testdata/toolsets-full-tools.json

@@ -135,9 +135,7 @@
   {
     "annotations": {
       "title": "Node: Files",
-      "readOnlyHint": false,
       "destructiveHint": true,
-      "idempotentHint": false,
       "openWorldHint": true
     },
     "description": "Perform file operations (put, get, list) on a Kubernetes node filesystem by creating a privileged pod. WARNING: Requires privileged access to the node. This tool creates a temporary privileged pod that mounts the node's root filesystem to perform file operations. The pod is automatically deleted after the operation completes.",
@@ -205,7 +203,7 @@
           "type": "string"
         },
         "query": {
-          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/<log-file-name>\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
+          "description": "query specifies services(s) or files from which to return logs (required). Example: \"kubelet\" to fetch kubelet logs, \"/\u003clog-file-name\u003e\" to fetch a specific log file from the node (e.g., \"/var/log/kubelet.log\" or \"/var/log/kube-proxy.log\")",
           "type": "string"
         },
         "tailLines": {
@@ -682,4 +680,4 @@
     },
     "name": "resources_scale"
   }
-]
+]