kubectl-mcp-server 1.14.0__py3-none-any.whl → 1.15.0__py3-none-any.whl

kubectl_mcp_tool/tools/storage.py

@@ -1,8 +1,10 @@
 import logging
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional
 
 from mcp.types import ToolAnnotations
 
+from ..k8s_config import get_k8s_client, get_storage_client
+
 logger = logging.getLogger("mcp-server")
 
 
@@ -15,12 +17,18 @@ def register_storage_tools(server, non_destructive: bool):
             readOnlyHint=True,
         ),
     )
-    def get_persistent_volumes(name: Optional[str] = None) -> Dict[str, Any]:
-        """Get Persistent Volumes in the cluster."""
+    def get_persistent_volumes(
+        name: Optional[str] = None,
+        context: str = ""
+    ) -> Dict[str, Any]:
+        """Get Persistent Volumes in the cluster.
+
+        Args:
+            name: Specific PV name to get (all PVs if not specified)
+            context: Kubernetes context to use (uses current context if not specified)
+        """
         try:
-            from kubernetes import client, config
-            config.load_kube_config()
-            v1 = client.CoreV1Api()
+            v1 = get_k8s_client(context)
 
             if name:
                 pv = v1.read_persistent_volume(name)
@@ -39,6 +47,7 @@ def register_storage_tools(server, non_destructive: bool):
 
             return {
                 "success": True,
+                "context": context or "current",
                 "persistentVolumes": [
                     {
                         "name": pv.metadata.name,
@@ -66,12 +75,18 @@ def register_storage_tools(server, non_destructive: bool):
             readOnlyHint=True,
         ),
     )
-    def get_pvcs(namespace: Optional[str] = None) -> Dict[str, Any]:
-        """Get Persistent Volume Claims in a namespace or cluster-wide."""
+    def get_pvcs(
+        namespace: Optional[str] = None,
+        context: str = ""
+    ) -> Dict[str, Any]:
+        """Get Persistent Volume Claims in a namespace or cluster-wide.
+
+        Args:
+            namespace: Namespace to list PVCs from (all namespaces if not specified)
+            context: Kubernetes context to use (uses current context if not specified)
+        """
         try:
-            from kubernetes import client, config
-            config.load_kube_config()
-            v1 = client.CoreV1Api()
+            v1 = get_k8s_client(context)
 
             if namespace:
                 pvcs = v1.list_namespaced_persistent_volume_claim(namespace)
@@ -80,6 +95,7 @@ def register_storage_tools(server, non_destructive: bool):
 
             return {
                 "success": True,
+                "context": context or "current",
                 "pvcs": [
                     {
                         "name": pvc.metadata.name,
@@ -103,17 +119,20 @@ def register_storage_tools(server, non_destructive: bool):
             readOnlyHint=True,
         ),
     )
-    def get_storage_classes() -> Dict[str, Any]:
-        """Get Storage Classes in the cluster."""
+    def get_storage_classes(context: str = "") -> Dict[str, Any]:
+        """Get Storage Classes in the cluster.
+
+        Args:
+            context: Kubernetes context to use (uses current context if not specified)
+        """
         try:
-            from kubernetes import client, config
-            config.load_kube_config()
-            storage = client.StorageV1Api()
+            storage = get_storage_client(context)
 
             scs = storage.list_storage_class()
 
             return {
                 "success": True,
+                "context": context or "current",
                 "storageClasses": [
                     {
                         "name": sc.metadata.name,

tests/test_browser.py

@@ -501,11 +501,11 @@ class TestServerIntegration:
                         tools = asyncio.run(server.server.list_tools())
                         tool_names = [t.name for t in tools]
 
-                        # Should have browser tools (127 + 26 = 153)
+                        # Should have browser tools (131 + 26 = 157)
                         assert "browser_open" in tool_names
                         assert "browser_screenshot" in tool_names
                         assert "browser_connect_cdp" in tool_names  # v0.7 tool
-                        assert len(tools) == 153, f"Expected 153 tools (127 + 26), got {len(tools)}"
+                        assert len(tools) == 157, f"Expected 157 tools (131 + 26), got {len(tools)}"
 
 
 import asyncio

tests/test_tools.py

@@ -1,8 +1,8 @@
 """
 Unit tests for all MCP tools in kubectl-mcp-server.
 
-This module contains comprehensive tests for all 121 Kubernetes tools
-provided by the MCP server.
+This module contains comprehensive tests for all 125 Kubernetes tools
+provided by the MCP server (131 total with UI tools).
 """
 
 import pytest
@@ -12,7 +12,7 @@ from unittest.mock import patch, MagicMock
 from datetime import datetime
 
 
-# Complete list of all 127 tools that must be registered (121 core + 6 UI)
+# Complete list of all 131 tools that must be registered (125 core + 6 UI)
 EXPECTED_TOOLS = [
     # Pods (pods.py)
     "get_pods", "get_logs", "get_pod_events", "check_pod_health", "exec_in_pod",
@@ -24,10 +24,11 @@ EXPECTED_TOOLS = [
     # Core (core.py)
     "get_namespaces", "get_configmaps", "get_secrets", "get_events",
     "get_resource_quotas", "get_limit_ranges",
-    # Cluster (cluster.py)
-    "get_current_context", "switch_context", "list_contexts", "list_kubeconfig_contexts",
+    # Cluster (cluster.py) - includes multi-cluster config tools
+    "get_current_context", "switch_context", "list_contexts_tool",
     "get_context_details", "set_namespace_for_context", "get_cluster_info",
     "get_cluster_version", "get_nodes", "get_api_resources", "health_check",
+    "kubeconfig_view", "get_api_versions", "check_crd_exists", "list_crds", "get_nodes_summary",
     # Networking (networking.py)
     "get_services", "get_endpoints", "get_ingress", "port_forward",
     "diagnose_network_connectivity", "check_dns_resolution", "trace_service_chain",
@@ -68,11 +69,11 @@ EXPECTED_TOOLS = [
 
 
 class TestAllToolsRegistered:
-    """Comprehensive tests to verify all 127 tools are registered (121 core + 6 UI)."""
+    """Comprehensive tests to verify all 131 tools are registered (125 core + 6 UI)."""
 
     @pytest.mark.unit
     def test_all_127_tools_registered(self):
-        """Verify all 127 expected tools are registered (excluding optional browser tools)."""
+        """Verify all 131 expected tools are registered (excluding optional browser tools)."""
         import os
         from kubectl_mcp_tool.mcp_server import MCPServer
 
@@ -93,8 +94,8 @@ class TestAllToolsRegistered:
             tools = asyncio.run(get_tools())
             tool_names = {t.name for t in tools}
 
-            # Verify count (127 tools = 121 core + 6 UI, browser tools disabled)
-            assert len(tools) == 127, f"Expected 127 tools, got {len(tools)}"
+            # Verify count (131 tools = 125 core + 6 UI, browser tools disabled)
+            assert len(tools) == 131, f"Expected 131 tools, got {len(tools)}"
 
             # Check for missing tools
             missing_tools = set(EXPECTED_TOOLS) - tool_names