changed: get/list resources can work with cluster level

Author: strowk

internal/k8s/core/v1/node/get_node_test.yaml

@@ -0,0 +1,33 @@
+case: Get k8s node using get-k8s-resources tool
+in:
+  {
+    "jsonrpc": "2.0",
+    "method": "tools/call",
+    "id": 2,
+    "params":
+      {
+        "name": "get-k8s-resource",
+        "arguments":
+          {
+            "context": "k3d-mcp-k8s-integration-test",
+            "kind": "node",
+            "name": "k3d-mcp-k8s-integration-test-server-0",
+          },
+      },
+  }
+out:
+  {
+    "jsonrpc": "2.0",
+    "id": 2,
+    "result":
+      {
+        "content":
+          [
+            {
+              "type": "text",
+              "text": !!ere '{"apiVersion":"v1","kind":"Node","metadata":{/.*/"name":"k3d-mcp-k8s-integration-test-server-0"/.*/',
+            },
+          ],
+        "isError": false,
+      },
+  }

internal/k8s/core/v1/node/list_nodes_test.yaml

@@ -0,0 +1,23 @@
+case: List k8s nodes using list-k8s-resources tool
+in:
+  {
+    "jsonrpc": "2.0",
+    "method": "tools/call",
+    "id": 2,
+    "params":
+      {
+        "name": "list-k8s-resources",
+        "arguments":
+          { "context": "k3d-mcp-k8s-integration-test", "kind": "node" },
+      },
+  }
+out:
+  {
+    "jsonrpc": "2.0",
+    "id": 2,
+    "result":
+      {
+        "content": ["text": '{"name":"k3d-mcp-k8s-integration-test-server-0"}'],
+        "isError": false,
+      },
+  }

internal/tools/get_resource_tool.go

@@ -26,7 +26,7 @@ func NewGetResourceTool(pool k8s.ClientPool) fxctx.Tool {
 
 	inputSchema := toolinput.NewToolInputSchema(
 		toolinput.WithString(contextProperty, "Name of the Kubernetes context to use, defaults to current context"),
-		toolinput.WithRequiredString(namespaceProperty, "Namespace to get resource from"),
+		toolinput.WithString(namespaceProperty, "Namespace to get resource from"),
 		toolinput.WithString(groupProperty, "API Group of the resource to get"),
 		toolinput.WithString(versionProperty, "API Version of the resource to get"),
 		toolinput.WithRequiredString(kindProperty, "Kind of resource to get"),
@@ -47,10 +47,7 @@ func NewGetResourceTool(pool k8s.ClientPool) fxctx.Tool {
 			}
 
 			k8sCtx := input.StringOr(contextProperty, "")
-			namespace, err := input.String(namespaceProperty)
-			if err != nil {
-				return utils.ErrResponse(err)
-			}
+			namespace := input.StringOr(namespaceProperty, "")
 
 			kind, err := input.String(kindProperty)
 			if err != nil {
@@ -72,7 +69,14 @@ func NewGetResourceTool(pool k8s.ClientPool) fxctx.Tool {
 				return utils.ErrResponse(err)
 			}
 
-			accumulator, exist, err := informer.Informer().GetIndexer().GetByKey(fmt.Sprintf("%s/%s", namespace, name))
+			var key string
+
+			if namespace == "" {
+				key = name
+			} else {
+				key = fmt.Sprintf("%s/%s", namespace, name)
+			}
+			accumulator, exist, err := informer.Informer().GetIndexer().GetByKey(key)
 			if err != nil {
 				return utils.ErrResponse(err)
 			}
@@ -87,7 +91,7 @@ func NewGetResourceTool(pool k8s.ClientPool) fxctx.Tool {
 			object := unstructuredAcc.Object
 
 			if metadata, ok := object["metadata"]; ok {
-				if metadataMap, ok := metadata.(map[string]interface{}); ok {
+				if metadataMap, ok := metadata.(map[string]any); ok {
 					// this is too big and somewhat useless
 					delete(metadataMap, "managedFields")
 				}
@@ -118,7 +122,7 @@ func NewGetResourceTool(pool k8s.ClientPool) fxctx.Tool {
 			var contents = []any{cnt}
 
 			return &mcp.CallToolResult{
-				Meta:    map[string]interface{}{},
+				Meta:    map[string]any{},
 				Content: contents,
 				IsError: utils.Ptr(false),
 			}

internal/tools/list_resources_tool.go

@@ -142,7 +142,7 @@ func NewListResourcesTool(pool k8s.ClientPool) fxctx.Tool {
 
 type GenericListContent struct {
 	Name      string `json:"name"`
-	Namespace string `json:"namespace"`
+	Namespace string `json:"namespace,omitempty"`
 }
 
 func (l GenericListContent) GetName() string {

main_test.go

@@ -61,6 +61,7 @@ func TestInK3dCluster(t *testing.T) {
 		"testdata/with_k3d",
 		"internal/k8s/apps/v1/deployment",
 		"internal/k8s/core/v1/pod",
+		"internal/k8s/core/v1/node",
 		"internal/k8s/core/v1/service",
 	}