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

kubectl_mcp_tool/tools/capi.py

@@ -1,7 +1,4 @@
-"""Cluster API (CAPI) toolset for kubectl-mcp-server.
-
-Provides tools for managing Cluster API clusters and machine lifecycle.
-"""
+"""Cluster API (CAPI) toolset for kubectl-mcp-server."""
 
 import subprocess
 import json
@@ -14,11 +11,10 @@ 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
 
 
-# Cluster API CRDs
 CLUSTER_CRD = "clusters.cluster.x-k8s.io"
 MACHINE_CRD = "machines.cluster.x-k8s.io"
 MACHINEDEPLOYMENT_CRD = "machinedeployments.cluster.x-k8s.io"
@@ -28,40 +24,6 @@ MACHINEHEALTHCHECK_CRD = "machinehealthchecks.cluster.x-k8s.io"
 CLUSTERCLASS_CRD = "clusterclasses.cluster.x-k8s.io"
 
 
-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 _clusterctl_available() -> bool:
     """Check if clusterctl CLI is available."""
     try:
@@ -93,12 +55,10 @@ def capi_clusters_list(
         }
 
     clusters = []
-    for item in _get_resources("clusters.cluster.x-k8s.io", namespace, context, label_selector):
+    for item in get_resources("clusters.cluster.x-k8s.io", namespace, context, label_selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
         conditions = status.get("conditions", [])
-
-        # Find key conditions
         ready_cond = next((c for c in conditions if c.get("type") == "Ready"), {})
         infra_ready = next((c for c in conditions if c.get("type") == "InfrastructureReady"), {})
         cp_ready = next((c for c in conditions if c.get("type") == "ControlPlaneReady"), {})
@@ -120,7 +80,6 @@ def capi_clusters_list(
             "failure_message": status.get("failureMessage"),
         })
 
-    # Summary
     ready = sum(1 for c in clusters if c["ready"])
     provisioning = sum(1 for c in clusters if c["phase"] == "Provisioning")
 
@@ -152,7 +111,7 @@ def capi_cluster_get(
         return {"success": False, "error": "Cluster API is not installed"}
 
     args = ["get", "clusters.cluster.x-k8s.io", name, "-n", namespace, "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -191,14 +150,13 @@ def capi_machines_list(
             "error": "Cluster API is not installed (machines.cluster.x-k8s.io CRD not found)"
         }
 
-    # Build label selector
     selector = label_selector
     if cluster_name:
         cluster_label = f"cluster.x-k8s.io/cluster-name={cluster_name}"
         selector = f"{selector},{cluster_label}" if selector else cluster_label
 
     machines = []
-    for item in _get_resources("machines.cluster.x-k8s.io", namespace, context, selector):
+    for item in get_resources("machines.cluster.x-k8s.io", namespace, context, selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
         conditions = status.get("conditions", [])
@@ -223,7 +181,6 @@ def capi_machines_list(
             "failure_message": status.get("failureMessage"),
         })
 
-    # Summary
     ready = sum(1 for m in machines if m["ready"])
     running = sum(1 for m in machines if m["phase"] == "Running")
 
@@ -255,7 +212,7 @@ def capi_machine_get(
         return {"success": False, "error": "Cluster API is not installed"}
 
     args = ["get", "machines.cluster.x-k8s.io", name, "-n", namespace, "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -294,14 +251,13 @@ def capi_machinedeployments_list(
             "error": "MachineDeployments CRD not found"
         }
 
-    # Build label selector
     selector = label_selector
     if cluster_name:
         cluster_label = f"cluster.x-k8s.io/cluster-name={cluster_name}"
         selector = f"{selector},{cluster_label}" if selector else cluster_label
 
     deployments = []
-    for item in _get_resources("machinedeployments.cluster.x-k8s.io", namespace, context, selector):
+    for item in get_resources("machinedeployments.cluster.x-k8s.io", namespace, context, selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
         conditions = status.get("conditions", [])
@@ -361,7 +317,7 @@ def capi_machinedeployment_scale(
         "-n", namespace,
         f"--replicas={replicas}"
     ]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         return {
@@ -402,7 +358,7 @@ def capi_machinesets_list(
         selector = f"{selector},{cluster_label}" if selector else cluster_label
 
     machinesets = []
-    for item in _get_resources("machinesets.cluster.x-k8s.io", namespace, context, selector):
+    for item in get_resources("machinesets.cluster.x-k8s.io", namespace, context, selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
 
@@ -457,7 +413,7 @@ def capi_machinehealthchecks_list(
         selector = f"{selector},{cluster_label}" if selector else cluster_label
 
     healthchecks = []
-    for item in _get_resources("machinehealthchecks.cluster.x-k8s.io", namespace, context, selector):
+    for item in get_resources("machinehealthchecks.cluster.x-k8s.io", namespace, context, selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
         conditions = status.get("conditions", [])
@@ -506,7 +462,7 @@ def capi_clusterclasses_list(
         }
 
     classes = []
-    for item in _get_resources("clusterclasses.cluster.x-k8s.io", namespace, context, label_selector):
+    for item in get_resources("clusterclasses.cluster.x-k8s.io", namespace, context, label_selector):
         spec = item.get("spec", {})
         status = item.get("status", {})
         conditions = status.get("conditions", [])
@@ -559,7 +515,7 @@ def capi_cluster_kubeconfig(
     # CAPI stores kubeconfig in a secret named <cluster-name>-kubeconfig
     secret_name = f"{name}-kubeconfig"
     args = ["get", "secret", secret_name, "-n", namespace, "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:

kubectl_mcp_tool/tools/certs.py

@@ -1,12 +1,8 @@
-"""Cert-Manager toolset for kubectl-mcp-server.
+"""Cert-Manager toolset for kubectl-mcp-server."""
 
-Provides tools for managing certificates via cert-manager.
-"""
-
-import subprocess
 import json
 from typing import Dict, Any, List, Optional
-from datetime import datetime, timezone
+from datetime import datetime
 
 try:
     from fastmcp import FastMCP
@@ -15,8 +11,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
 
 
 CERTIFICATE_CRD = "certificates.cert-manager.io"
@@ -27,27 +23,13 @@ ORDER_CRD = "orders.acme.cert-manager.io"
 CHALLENGE_CRD = "challenges.acme.cert-manager.io"
 
 
-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)}
-
-
 class CertsResourceError(Exception):
     """Exception raised when fetching cert-manager resources fails."""
     pass
 
 
-def _get_resources(kind: str, namespace: str = "", context: str = "", label_selector: str = "") -> List[Dict]:
-    """Get Kubernetes resources of a specific kind.
+def _get_certs_resources(kind: str, namespace: str = "", context: str = "", label_selector: str = "") -> List[Dict]:
+    """Get cert-manager resources with error handling.
 
     Raises:
         CertsResourceError: If kubectl command fails or output cannot be parsed
@@ -60,7 +42,7 @@ def _get_resources(kind: str, namespace: str = "", context: str = "", label_sele
     if label_selector:
         args.extend(["-l", label_selector])
 
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
     if not result["success"]:
         error_msg = result.get("error", "Unknown error")
         raise CertsResourceError(
@@ -115,7 +97,7 @@ def certs_list(
         }
 
     try:
-        resources = _get_resources("certificates.cert-manager.io", namespace, context, label_selector)
+        resources = _get_certs_resources("certificates.cert-manager.io", namespace, context, label_selector)
     except CertsResourceError as e:
         return {"success": False, "error": str(e)}
 
@@ -214,7 +196,7 @@ def certs_issuers_list(
 
     if crd_exists(ISSUER_CRD, context):
         try:
-            issuer_resources = _get_resources("issuers.cert-manager.io", namespace, context)
+            issuer_resources = _get_certs_resources("issuers.cert-manager.io", namespace, context)
         except CertsResourceError as e:
             return {"success": False, "error": str(e)}
 
@@ -248,7 +230,7 @@ def certs_issuers_list(
 
     if include_cluster_issuers and crd_exists(CLUSTER_ISSUER_CRD, context):
         try:
-            cluster_issuer_resources = _get_resources("clusterissuers.cert-manager.io", "", context)
+            cluster_issuer_resources = _get_certs_resources("clusterissuers.cert-manager.io", "", context)
         except CertsResourceError as e:
             return {"success": False, "error": str(e)}
 
@@ -528,7 +510,7 @@ def certs_challenges_list(
         }
 
     challenges = []
-    for item in _get_resources("challenges.acme.cert-manager.io", namespace, context, label_selector):
+    for item in _get_certs_resources("challenges.acme.cert-manager.io", namespace, context, label_selector):
         status = item.get("status", {})
         spec = item.get("spec", {})
 
@@ -576,7 +558,7 @@ def certs_requests_list(
         }
 
     requests = []
-    for item in _get_resources("certificaterequests.cert-manager.io", namespace, context, label_selector):
+    for item in _get_certs_resources("certificaterequests.cert-manager.io", namespace, context, label_selector):
         status = item.get("status", {})
         conditions = status.get("conditions", [])
         ready_cond = _get_condition(conditions, "Ready")

kubectl_mcp_tool/tools/cilium.py

@@ -1,11 +1,8 @@
-"""Cilium/Hubble network toolset for kubectl-mcp-server.
-
-Provides tools for managing Cilium network policies and observability.
-"""
+"""Cilium/Hubble network toolset for kubectl-mcp-server."""
 
 import subprocess
 import json
-from typing import Dict, Any, List, Optional
+from typing import Dict, Any, List
 
 try:
     from fastmcp import FastMCP
@@ -14,8 +11,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
 
 
 CILIUM_NETWORK_POLICY_CRD = "ciliumnetworkpolicies.cilium.io"
@@ -25,40 +22,6 @@ CILIUM_IDENTITY_CRD = "ciliumidentities.cilium.io"
 CILIUM_NODE_CRD = "ciliumnodes.cilium.io"
 
 
-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 _cilium_cli_available() -> bool:
     """Check if cilium CLI is available."""
     try:
@@ -95,7 +58,7 @@ def cilium_policies_list(
     policies = []
 
     if crd_exists(CILIUM_NETWORK_POLICY_CRD, context):
-        for item in _get_resources("ciliumnetworkpolicies.cilium.io", namespace, context):
+        for item in get_resources("ciliumnetworkpolicies.cilium.io", namespace, context):
             spec = item.get("spec", {})
             status = item.get("status", {})
 
@@ -123,7 +86,7 @@ def cilium_policies_list(
             })
 
     if include_clusterwide and crd_exists(CILIUM_CLUSTERWIDE_POLICY_CRD, context):
-        for item in _get_resources("ciliumclusterwidenetworkpolicies.cilium.io", "", context):
+        for item in get_resources("ciliumclusterwidenetworkpolicies.cilium.io", "", context):
             spec = item.get("spec", {})
             status = item.get("status", {})
 
@@ -182,7 +145,7 @@ def cilium_policy_get(
     if not crd_exists(crd, context):
         return {"success": False, "error": f"{crd} not found"}
 
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if result["success"]:
         try:
@@ -220,7 +183,7 @@ def cilium_endpoints_list(
         }
 
     endpoints = []
-    for item in _get_resources("ciliumendpoints.cilium.io", namespace, context, label_selector):
+    for item in get_resources("ciliumendpoints.cilium.io", namespace, context, label_selector):
         status = item.get("status", {})
         networking = status.get("networking", {})
         identity = status.get("identity", {})
@@ -275,7 +238,7 @@ def cilium_identities_list(
         }
 
     identities = []
-    for item in _get_resources("ciliumidentities.cilium.io", "", context, label_selector):
+    for item in get_resources("ciliumidentities.cilium.io", "", context, label_selector):
         security_labels = item.get("security-labels", {})
 
         identities.append({
@@ -308,7 +271,7 @@ def cilium_nodes_list(context: str = "") -> Dict[str, Any]:
         }
 
     nodes = []
-    for item in _get_resources("ciliumnodes.cilium.io", "", context):
+    for item in get_resources("ciliumnodes.cilium.io", "", context):
         spec = item.get("spec", {})
         status = item.get("status", {})
 
@@ -363,7 +326,7 @@ def cilium_status(context: str = "") -> Dict[str, Any]:
     # Fallback to kubectl
     # Check Cilium pods status
     args = ["get", "pods", "-n", "kube-system", "-l", "k8s-app=cilium", "-o", "json"]
-    result = _run_kubectl(args, context)
+    result = run_kubectl(args, context)
 
     if not result["success"]:
         return {"success": False, "error": result.get("error", "Failed to get Cilium status")}