kubectl-mcp-server 1.18.0__py3-none-any.whl → 1.19.1__py3-none-any.whl

kubectl_mcp_tool/tools/policy.py

@@ -1,9 +1,5 @@
-"""Policy toolset for kubectl-mcp-server.
+"""Policy toolset for kubectl-mcp-server (Kyverno and Gatekeeper)."""
 
-Provides tools for managing Kyverno and Gatekeeper policies.
-"""
-
-import subprocess
 import json
 from typing import Dict, Any, List, Optional
 
@@ -14,8 +10,8 @@ except ImportError:
     from mcp.server.fastmcp import FastMCP
     from mcp.types import ToolAnnotations
 
-from ..k8s_config import _get_kubectl_context_args
 from ..crd_detector import crd_exists
+from .utils import run_kubectl, get_resources
 
 
 KYVERNO_CLUSTER_POLICY_CRD = "clusterpolicies.kyverno.io"
@@ -26,40 +22,6 @@ GATEKEEPER_CONSTRAINT_TEMPLATE_CRD = "constrainttemplates.templates.gatekeeper.s
 GATEKEEPER_CONFIG_CRD = "configs.config.gatekeeper.sh"
 
 
-def _run_kubectl(args: List[str], context: str = "") -> Dict[str, Any]:
-    """Run kubectl command and return result."""
-    cmd = ["kubectl"] + _get_kubectl_context_args(context) + args
-    try:
-        result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
-        if result.returncode == 0:
-            return {"success": True, "output": result.stdout}
-        return {"success": False, "error": result.stderr}
-    except subprocess.TimeoutExpired:
-        return {"success": False, "error": "Command timed out"}
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
-def _get_resources(kind: str, namespace: str = "", context: str = "", label_selector: str = "") -> List[Dict]:
-    """Get Kubernetes resources of a specific kind."""
-    args = ["get", kind, "-o", "json"]
-    if namespace:
-        args.extend(["-n", namespace])
-    else:
-        args.append("-A")
-    if label_selector:
-        args.extend(["-l", label_selector])
-
-    result = _run_kubectl(args, context)
-    if result["success"]:
-        try:
-            data = json.loads(result["output"])
-            return data.get("items", [])
-        except json.JSONDecodeError:
-            return []
-    return []
-
-
 def _get_condition(conditions: List[Dict], condition_type: str) -> Optional[Dict]:
     """Get a specific condition from conditions list."""
     return next((c for c in conditions if c.get("type") == condition_type), None)
@@ -86,7 +48,7 @@ def policy_list(
 
     if engine in ("kyverno", "all"):
         if crd_exists(KYVERNO_CLUSTER_POLICY_CRD, context):
-            for item in _get_resources("clusterpolicies.kyverno.io", "", context, label_selector):
+            for item in get_resources("clusterpolicies.kyverno.io", "", context, label_selector):
                 status = item.get("status", {})
                 conditions = status.get("conditions", [])
                 ready_cond = _get_condition(conditions, "Ready")
@@ -105,7 +67,7 @@ def policy_list(
                 })
 
         if crd_exists(KYVERNO_POLICY_CRD, context):
-            for item in _get_resources("policies.kyverno.io", namespace, context, label_selector):
+            for item in get_resources("policies.kyverno.io", namespace, context, label_selector):
                 status = item.get("status", {})
                 conditions = status.get("conditions", [])
                 ready_cond = _get_condition(conditions, "Ready")
@@ -125,7 +87,7 @@ def policy_list(
 
     if engine in ("gatekeeper", "all"):
         if crd_exists(GATEKEEPER_CONSTRAINT_TEMPLATE_CRD, context):
-            for item in _get_resources("constrainttemplates.templates.gatekeeper.sh", "", context, label_selector):
+            for item in get_resources("constrainttemplates.templates.gatekeeper.sh", "", context, label_selector):
                 status = item.get("status", {})
                 spec = item.get("spec", {})
 
@@ -158,14 +120,14 @@ def _get_gatekeeper_constraints(context: str = "") -> List[Dict]:
     """Get all Gatekeeper constraints dynamically."""
     constraints = []
 
-    templates = _get_resources("constrainttemplates.templates.gatekeeper.sh", "", context)
+    templates = get_resources("constrainttemplates.templates.gatekeeper.sh", "", context)
     for template in templates:
         crd_kind = template.get("spec", {}).get("crd", {}).get("spec", {}).get("names", {}).get("kind", "")
         if not crd_kind:
             continue
 
         try:
-            constraint_items = _get_resources(crd_kind.lower(), "", context)
+            constraint_items = get_resources(crd_kind.lower(), "", context)
             for item in constraint_items:
                 status = item.get("status", {})
                 spec = item.get("spec", {})
@@ -222,7 +184,7 @@ def policy_get(
     else:
         args = ["get", k8s_kind, name, "-o", "json"]
 
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -259,7 +221,7 @@ def policy_violations_list(
 
     if engine in ("kyverno", "all"):
         if crd_exists(KYVERNO_POLICY_REPORT_CRD, context):
-            for report in _get_resources("policyreports.wgpolicyk8s.io", namespace, context):
+            for report in get_resources("policyreports.wgpolicyk8s.io", namespace, context):
                 results = report.get("results", [])
                 for result in results:
                     if result.get("result") in ("fail", "error"):
@@ -279,7 +241,7 @@ def policy_violations_list(
                         })
 
         if crd_exists(KYVERNO_CLUSTER_POLICY_REPORT_CRD, context):
-            for report in _get_resources("clusterpolicyreports.wgpolicyk8s.io", "", context):
+            for report in get_resources("clusterpolicyreports.wgpolicyk8s.io", "", context):
                 results = report.get("results", [])
                 for result in results:
                     if result.get("result") in ("fail", "error"):
@@ -350,7 +312,7 @@ def policy_explain_denial(
     message_lower = message.lower()
 
     if crd_exists(KYVERNO_CLUSTER_POLICY_CRD, context):
-        for policy in _get_resources("clusterpolicies.kyverno.io", "", context):
+        for policy in get_resources("clusterpolicies.kyverno.io", "", context):
             policy_name = policy["metadata"]["name"]
             if policy_name.lower() in message_lower:
                 spec = policy.get("spec", {})

kubectl_mcp_tool/tools/rollouts.py

@@ -1,7 +1,4 @@
-"""Argo Rollouts and Flagger progressive delivery toolset for kubectl-mcp-server.
-
-Provides tools for managing canary deployments, blue-green deployments, and progressive delivery.
-"""
+"""Argo Rollouts and Flagger progressive delivery toolset for kubectl-mcp-server."""
 
 import subprocess
 import json
@@ -15,57 +12,20 @@ except ImportError:
     from mcp.server.fastmcp import FastMCP
     from mcp.types import ToolAnnotations
 
-from ..k8s_config import _get_kubectl_context_args
 from ..crd_detector import crd_exists
+from .utils import run_kubectl, get_resources
 
 
-# Argo Rollouts CRDs
 ARGO_ROLLOUT_CRD = "rollouts.argoproj.io"
 ARGO_ANALYSIS_TEMPLATE_CRD = "analysistemplates.argoproj.io"
 ARGO_CLUSTER_ANALYSIS_TEMPLATE_CRD = "clusteranalysistemplates.argoproj.io"
 ARGO_ANALYSIS_RUN_CRD = "analysisruns.argoproj.io"
 ARGO_EXPERIMENT_CRD = "experiments.argoproj.io"
-
-# Flagger CRDs
 FLAGGER_CANARY_CRD = "canaries.flagger.app"
 FLAGGER_METRIC_TEMPLATE_CRD = "metrictemplates.flagger.app"
 FLAGGER_ALERT_PROVIDER_CRD = "alertproviders.flagger.app"
 
 
-def _run_kubectl(args: List[str], context: str = "") -> Dict[str, Any]:
-    """Run kubectl command and return result."""
-    cmd = ["kubectl"] + _get_kubectl_context_args(context) + args
-    try:
-        result = subprocess.run(cmd, capture_output=True, text=True, timeout=60)
-        if result.returncode == 0:
-            return {"success": True, "output": result.stdout}
-        return {"success": False, "error": result.stderr}
-    except subprocess.TimeoutExpired:
-        return {"success": False, "error": "Command timed out"}
-    except Exception as e:
-        return {"success": False, "error": str(e)}
-
-
-def _get_resources(kind: str, namespace: str = "", context: str = "", label_selector: str = "") -> List[Dict]:
-    """Get Kubernetes resources of a specific kind."""
-    args = ["get", kind, "-o", "json"]
-    if namespace:
-        args.extend(["-n", namespace])
-    else:
-        args.append("-A")
-    if label_selector:
-        args.extend(["-l", label_selector])
-
-    result = _run_kubectl(args, context)
-    if result["success"]:
-        try:
-            data = json.loads(result["output"])
-            return data.get("items", [])
-        except json.JSONDecodeError:
-            return []
-    return []
-
-
 def _argo_rollouts_cli_available() -> bool:
     """Check if kubectl-argo-rollouts plugin is available."""
     try:
@@ -76,8 +36,6 @@ def _argo_rollouts_cli_available() -> bool:
         return False
 
 
-# ============== Argo Rollouts Functions ==============
-
 def rollouts_list(
     namespace: str = "",
     context: str = "",
@@ -100,11 +58,9 @@ def rollouts_list(
         }
 
     rollouts = []
-    for item in _get_resources("rollouts.argoproj.io", namespace, context, label_selector):
+    for item in get_resources("rollouts.argoproj.io", namespace, context, label_selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
-
-        # Determine strategy
         strategy_spec = spec.get("strategy", {})
         if "canary" in strategy_spec:
             strategy = "canary"
@@ -116,7 +72,6 @@ def rollouts_list(
             strategy = "unknown"
             strategy_details = {}
 
-        # Get conditions
         conditions = status.get("conditions", [])
         available_cond = next((c for c in conditions if c.get("type") == "Available"), {})
         progressing_cond = next((c for c in conditions if c.get("type") == "Progressing"), {})
@@ -142,7 +97,6 @@ def rollouts_list(
             "aborted": status.get("abort", False),
         })
 
-    # Summary
     healthy = sum(1 for r in rollouts if r["phase"] == "Healthy")
     progressing = sum(1 for r in rollouts if r["phase"] == "Progressing")
     paused = sum(1 for r in rollouts if r["paused"])
@@ -176,7 +130,7 @@ def rollout_get(
         return {"success": False, "error": "Argo Rollouts is not installed"}
 
     args = ["get", "rollouts.argoproj.io", name, "-n", namespace, "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -216,7 +170,6 @@ def rollout_status(
     spec = rollout.get("spec", {})
     strategy_spec = spec.get("strategy", {})
 
-    # Determine strategy
     if "canary" in strategy_spec:
         strategy = "canary"
         steps = strategy_spec.get("canary", {}).get("steps", [])
@@ -228,8 +181,6 @@ def rollout_status(
         steps = []
 
     current_step = status.get("currentStepIndex", 0)
-
-    # Parse steps
     step_info = []
     for i, step in enumerate(steps):
         step_type = list(step.keys())[0] if step else "unknown"
@@ -314,7 +265,7 @@ def rollout_promote(
         "--type=merge",
         "-p", json.dumps(patch)
     ]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         return {
@@ -370,7 +321,7 @@ def rollout_abort(
         "--type=merge",
         "-p", json.dumps(patch)
     ]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         return {
@@ -426,7 +377,7 @@ def rollout_retry(
         "--type=merge",
         "-p", json.dumps(patch)
     ]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         return {
@@ -487,7 +438,7 @@ def rollout_restart(
         "--type=merge",
         "-p", json.dumps(patch)
     ]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         return {
@@ -521,7 +472,7 @@ def analysis_runs_list(
         }
 
     runs = []
-    for item in _get_resources("analysisruns.argoproj.io", namespace, context, label_selector):
+    for item in get_resources("analysisruns.argoproj.io", namespace, context, label_selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
 
@@ -551,8 +502,6 @@ def analysis_runs_list(
     }
 
 
-# ============== Flagger Functions ==============
-
 def flagger_canaries_list(
     namespace: str = "",
     context: str = "",
@@ -575,7 +524,7 @@ def flagger_canaries_list(
         }
 
     canaries = []
-    for item in _get_resources("canaries.flagger.app", namespace, context, label_selector):
+    for item in get_resources("canaries.flagger.app", namespace, context, label_selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
         analysis = spec.get("analysis", {})
@@ -597,7 +546,6 @@ def flagger_canaries_list(
             "last_transition_time": status.get("lastTransitionTime", ""),
         })
 
-    # Summary
     progressing = sum(1 for c in canaries if c["phase"] == "Progressing")
     succeeded = sum(1 for c in canaries if c["phase"] == "Succeeded")
     failed = sum(1 for c in canaries if c["phase"] == "Failed")
@@ -631,7 +579,7 @@ def flagger_canary_get(
         return {"success": False, "error": "Flagger is not installed"}
 
     args = ["get", "canaries.flagger.app", name, "-n", namespace, "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -683,7 +631,6 @@ def rollouts_detect(context: str = "") -> Dict[str, Any]:
 def register_rollouts_tools(mcp: FastMCP, non_destructive: bool = False):
     """Register progressive delivery tools with the MCP server."""
 
-    # Argo Rollouts tools
     @mcp.tool(annotations=ToolAnnotations(readOnlyHint=True))
     def rollouts_list_tool(
         namespace: str = "",
@@ -765,7 +712,6 @@ def register_rollouts_tools(mcp: FastMCP, non_destructive: bool = False):
         """List Argo Rollouts AnalysisRuns."""
         return json.dumps(analysis_runs_list(namespace, context, label_selector), indent=2)
 
-    # Flagger tools
     @mcp.tool(annotations=ToolAnnotations(readOnlyHint=True))
     def flagger_canaries_list_tool(
         namespace: str = "",

kubectl_mcp_tool/tools/utils.py

@@ -0,0 +1,41 @@
+"""Shared utilities for kubectl-mcp-server tools."""
+
+import subprocess
+import json
+from typing import Any, Dict, List
+
+from ..k8s_config import _get_kubectl_context_args
+
+
+def run_kubectl(args: List[str], context: str = "", timeout: int = 60) -> Dict[str, Any]:
+    """Run kubectl command and return result."""
+    cmd = ["kubectl"] + _get_kubectl_context_args(context) + args
+    try:
+        result = subprocess.run(cmd, capture_output=True, text=True, timeout=timeout)
+        if result.returncode == 0:
+            return {"success": True, "output": result.stdout}
+        return {"success": False, "error": result.stderr}
+    except subprocess.TimeoutExpired:
+        return {"success": False, "error": "Command timed out"}
+    except Exception as e:
+        return {"success": False, "error": str(e)}
+
+
+def get_resources(kind: str, namespace: str = "", context: str = "", label_selector: str = "") -> List[Dict]:
+    """Get Kubernetes resources of a specific kind."""
+    args = ["get", kind, "-o", "json"]
+    if namespace:
+        args.extend(["-n", namespace])
+    else:
+        args.append("-A")
+    if label_selector:
+        args.extend(["-l", label_selector])
+
+    result = run_kubectl(args, context)
+    if result["success"]:
+        try:
+            data = json.loads(result["output"])
+            return data.get("items", [])
+        except json.JSONDecodeError:
+            return []
+    return []

tests/test_tools.py

@@ -12,11 +12,11 @@ from unittest.mock import patch, MagicMock
 from datetime import datetime
 
 
-# Complete list of all 224 tools that must be registered (125 core + 6 UI + 93 ecosystem)
+# Complete list of all 235 tools that must be registered (136 core + 6 UI + 93 ecosystem)
 EXPECTED_TOOLS = [
     # Pods (pods.py)
     "get_pods", "get_logs", "get_pod_events", "check_pod_health", "exec_in_pod",
-    "cleanup_pods", "get_pod_conditions", "get_previous_logs", "diagnose_pod_crash",
+    "cleanup_pods", "run_pod", "get_pod_conditions", "get_previous_logs", "diagnose_pod_crash",
     "detect_pending_pods", "get_evicted_pods",
     # Deployments (deployments.py)
     "get_deployments", "create_deployment", "scale_deployment", "restart_deployment",
@@ -29,6 +29,12 @@ EXPECTED_TOOLS = [
     "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",
+    "node_logs_tool", "node_stats_summary_tool", "node_top_tool",
+    # Config management tools (cluster.py)
+    "get_server_config_status", "enable_kubeconfig_watching", "disable_kubeconfig_watching",
+    "set_server_stateless_mode",
+    # Multi-cluster tools (cluster.py)
+    "multi_cluster_query", "multi_cluster_health", "multi_cluster_pod_count",
     # Networking (networking.py)
     "get_services", "get_endpoints", "get_ingress", "port_forward",
     "diagnose_network_connectivity", "check_dns_resolution", "trace_service_chain",
@@ -109,11 +115,11 @@ EXPECTED_TOOLS = [
 
 
 class TestAllToolsRegistered:
-    """Comprehensive tests to verify all 224 tools are registered (125 core + 6 UI + 93 ecosystem)."""
+    """Comprehensive tests to verify all 235 tools are registered (136 core + 6 UI + 93 ecosystem)."""
 
     @pytest.mark.unit
     def test_all_164_tools_registered(self):
-        """Verify all 224 expected tools are registered (excluding optional browser tools)."""
+        """Verify all 235 expected tools are registered (excluding optional browser tools)."""
         import os
         from kubectl_mcp_tool.mcp_server import MCPServer
 
@@ -134,8 +140,8 @@ class TestAllToolsRegistered:
             tools = asyncio.run(get_tools())
             tool_names = {t.name for t in tools}
 
-            # Verify count (224 tools = 125 core + 6 UI + 93 ecosystem, browser tools disabled)
-            assert len(tools) == 224, f"Expected 224 tools, got {len(tools)}"
+            # Verify count (235 tools = 136 core + 6 UI + 93 ecosystem, browser tools disabled)
+            assert len(tools) == 235, f"Expected 235 tools, got {len(tools)}"
 
             # Check for missing tools
             missing_tools = set(EXPECTED_TOOLS) - tool_names
@@ -272,6 +278,32 @@ class TestPodTools:
                 with patch("kubectl_mcp_tool.mcp_server.MCPServer._check_dependencies", return_value=True):
                     server = MCPServer(name="test")
 
+    @pytest.mark.unit
+    def test_run_pod(self, mock_all_kubernetes_apis):
+        """Test running a container image as a pod."""
+        with patch("kubernetes.config.load_kube_config"):
+            with patch("kubernetes.client.CoreV1Api") as mock_api:
+                mock_pod = MagicMock()
+                mock_pod.metadata.name = "nginx-abc12345"
+                mock_pod.metadata.namespace = "default"
+                mock_pod.metadata.uid = "test-uid-123"
+                mock_pod.status.phase = "Pending"
+                mock_api.return_value.create_namespaced_pod.return_value = mock_pod
+
+                from kubectl_mcp_tool.mcp_server import MCPServer
+                with patch("kubectl_mcp_tool.mcp_server.MCPServer._check_dependencies", return_value=True):
+                    server = MCPServer(name="test")
+
+    @pytest.mark.unit
+    def test_run_pod_non_destructive_mode(self, mock_all_kubernetes_apis):
+        """Test that run_pod is blocked in non-destructive mode."""
+        from kubectl_mcp_tool.mcp_server import MCPServer
+        with patch("kubectl_mcp_tool.mcp_server.MCPServer._check_dependencies", return_value=True):
+            with patch("kubernetes.config.load_kube_config"):
+                server = MCPServer(name="test", disable_destructive=True)
+                # Non-destructive mode should be set via the non_destructive property
+                assert server.non_destructive is True
+
 
 class TestDeploymentTools:
     """Tests for deployment-related tools."""
@@ -621,11 +653,12 @@ class TestApplyAndDeleteTools:
         """Test non-destructive mode blocks destructive operations."""
         from kubectl_mcp_tool.mcp_server import MCPServer
         with patch("kubectl_mcp_tool.mcp_server.MCPServer._check_dependencies", return_value=True):
-            server = MCPServer(name="test", non_destructive=True)
-            result = server._check_destructive()
-            assert result is not None
-            assert result["success"] is False
-            assert "non-destructive mode" in result["error"]
+            with patch("kubernetes.config.load_kube_config"):
+                server = MCPServer(name="test", disable_destructive=True)
+                result = server._check_destructive()
+                assert result is not None
+                assert result["success"] is False
+                assert "non-destructive mode" in result["error"] or "disable-destructive" in result["error"]
 
 
 class TestToolAnnotations: