kubectl-mcp-server 1.22.0__tar.gz → 1.23.0__tar.gz

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubectl-mcp-server
-Version: 1.22.0
+Version: 1.23.0
 Summary: A Model Context Protocol (MCP) server for Kubernetes with 270+ tools, 8 resources, and 8 prompts
 Home-page: https://github.com/rohitg00/kubectl-mcp-server
 Author: Rohit Ghumare

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/kubectl_mcp_server.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kubectl-mcp-server
-Version: 1.22.0
+Version: 1.23.0
 Summary: A Model Context Protocol (MCP) server for Kubernetes with 270+ tools, 8 resources, and 8 prompts
 Home-page: https://github.com/rohitg00/kubectl-mcp-server
 Author: Rohit Ghumare

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/kubectl_mcp_tool/__init__.py

@@ -7,7 +7,7 @@ with Kubernetes clusters through natural language commands.
 For more information, see: https://github.com/rohitg00/kubectl-mcp-server
 """
 
-__version__ = "1.22.0"
+__version__ = "1.23.0"
 
 from .mcp_server import MCPServer
 from .diagnostics import run_diagnostics, check_kubectl_installation, check_cluster_connection

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/kubectl_mcp_tool/k8s_config.py

@@ -203,6 +203,7 @@ try:
         KubernetesProvider,
         ProviderConfig,
         ProviderType,
+        ProviderError,
         UnknownContextError,
         get_provider,
         get_context_names,
@@ -262,9 +263,21 @@ def load_kubernetes_config(context: str = ""):
 
 
 def _patched_load_kube_config(*args, **kwargs):
-    """Patched version of load_kube_config that tries in-cluster first."""
+    """Patched version of load_kube_config that tries in-cluster first.
+
+    When called with explicit arguments (config_file, context, client_configuration),
+    always pass through to the original function. Only try in-cluster as a
+    fallback for bare calls during initial module loading.
+    """
     global _config_loaded, _original_load_kube_config
 
+    has_explicit_args = bool(args) or bool(kwargs)
+
+    if has_explicit_args and _original_load_kube_config:
+        _original_load_kube_config(*args, **kwargs)
+        _config_loaded = True
+        return
+
     if _config_loaded:
         return
 
@@ -326,7 +339,7 @@ def _load_config_for_context(context: str = "") -> Any:
         try:
             provider = get_provider()
             return provider.get_api_client(context)
-        except UnknownContextError:
+        except (UnknownContextError, ProviderError):
             raise
         except Exception as e:
             logger.warning(f"Provider failed, falling back to basic config: {e}")
@@ -338,11 +351,20 @@ def _load_config_for_context(context: str = "") -> Any:
         config.load_incluster_config()
         return client.ApiClient()
     except ConfigException:
-        pass
+        logger.debug("In-cluster config not available in fallback path")
 
     kubeconfig_path = os.environ.get('KUBECONFIG', '~/.kube/config')
     kubeconfig_path = os.path.expanduser(kubeconfig_path)
 
+    if not os.path.exists(kubeconfig_path):
+        raise RuntimeError(
+            f"No Kubernetes configuration found. "
+            f"In-cluster config not available and kubeconfig not found at '{kubeconfig_path}'. "
+            f"If running in a Kubernetes pod, ensure the ServiceAccount token is mounted "
+            f"and KUBERNETES_SERVICE_HOST/KUBERNETES_SERVICE_PORT env vars are set. "
+            f"Set MCP_K8S_PROVIDER=in-cluster for in-cluster deployments."
+        )
+
     api_config = client.Configuration()
 
     if context:
@@ -543,7 +565,8 @@ _BASE_EXPORTS = [
 if _HAS_PROVIDER:
     __all__ = _BASE_EXPORTS + [
         "KubernetesProvider", "ProviderConfig", "ProviderType",
-        "UnknownContextError", "get_provider", "validate_context",
+        "ProviderError", "UnknownContextError",
+        "get_provider", "validate_context",
     ]
 else:
     __all__ = _BASE_EXPORTS

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/kubectl_mcp_tool/providers.py

@@ -150,8 +150,37 @@ class KubernetesProvider:
             raise ProviderError(f"Failed to load context '{self.config.context}': {e}")
 
     def _initialize_kubeconfig(self):
-        """Initialize for multi-cluster kubeconfig provider."""
+        """Initialize for multi-cluster kubeconfig provider.
+
+        Falls back to in-cluster config if kubeconfig file is not found.
+        """
         from kubernetes import config
+        from kubernetes.config.config_exception import ConfigException
+
+        kubeconfig_exists = os.path.exists(self.config.kubeconfig_path)
+
+        if not kubeconfig_exists:
+            try:
+                config.load_incluster_config()
+                self._in_cluster = True
+                self._active_context = "in-cluster"
+                self._contexts_cache = []
+                logger.info(
+                    f"Kubeconfig not found at {self.config.kubeconfig_path}, "
+                    f"using in-cluster config"
+                )
+                return
+            except ConfigException:
+                raise ProviderError(
+                    f"No Kubernetes configuration found. "
+                    f"Kubeconfig not found at '{self.config.kubeconfig_path}' and "
+                    f"in-cluster config is not available. "
+                    f"Ensure a valid kubeconfig exists, or if running inside a "
+                    f"Kubernetes pod, verify the ServiceAccount token is mounted "
+                    f"and KUBERNETES_SERVICE_HOST/KUBERNETES_SERVICE_PORT env vars "
+                    f"are set. For in-cluster deployments, set "
+                    f"MCP_K8S_PROVIDER=in-cluster."
+                )
 
         try:
             contexts, active = config.list_kube_config_contexts(

{kubectl_mcp_server-1.22.0 → kubectl_mcp_server-1.23.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="kubectl-mcp-server",
-    version="1.22.0",
+    version="1.23.0",
     author="Rohit Ghumare",
     author_email="ghumare64@gmail.com",
     description="A Model Context Protocol (MCP) server for Kubernetes with 270+ tools, 8 resources, and 8 prompts",