Apply review comments

Author: addyess

src/kube_galaxy/cmd/status.py

@@ -1,10 +1,18 @@
 """Status command handler."""
 
 import shutil
+from collections.abc import Callable
 
 import typer
 
-from kube_galaxy.pkg.utils.client import get_context, get_nodes, wait_for_nodes, wait_for_pods
+from kube_galaxy.pkg.utils.client import (
+    get_cluster_info,
+    get_context,
+    get_nodes,
+    get_pods,
+    wait_for_nodes,
+    wait_for_pods,
+)
 from kube_galaxy.pkg.utils.errors import ClusterError
 from kube_galaxy.pkg.utils.logging import error, info, print_dict, section, success, warning
 from kube_galaxy.pkg.utils.shell import run
@@ -70,6 +78,22 @@ def _verify_cluster_health(timeout: int) -> None:
         error("Cluster readiness checks failed", show_traceback=False)
         raise typer.Exit(code=1) from exc
 
+    _print_command_output(get_cluster_info, "Cluster Info")
+    _print_command_output(get_nodes, "Nodes")
+    _print_command_output(get_pods, "Pods")
+
+
+def _print_command_output(command: Callable[[], str], title: str) -> None:
+    """Run command and print its output with a section label."""
+    info("")
+    info(f"{title}:")
+    try:
+        if output := command().strip():
+            info(output)
+    except ClusterError as exc:
+        error(f"Failed to run: {title}", show_traceback=False)
+        raise typer.Exit(code=1) from exc
+
 
 def _check_command(cmd: str) -> str:
     """Check if a command is installed and return status."""

src/kube_galaxy/pkg/components/_base.py

@@ -25,7 +25,7 @@
     format_component_pattern,
     install_binary,
 )
-from kube_galaxy.pkg.utils.errors import ComponentError
+from kube_galaxy.pkg.utils.errors import ClusterError, ComponentError
 from kube_galaxy.pkg.utils.logging import info
 from kube_galaxy.pkg.utils.shell import run
 
@@ -244,7 +244,10 @@ def bootstrap_hook(self) -> None:
                     raise ComponentError(
                         f"{comp_name} manifest not downloaded. Run download hook first."
                     )
-                apply_manifest(self.manifest_path)
+                try:
+                    apply_manifest(self.manifest_path)
+                except ClusterError as e:
+                    raise ComponentError(f"Failed to apply manifest for {comp_name}") from e
 
         pass
 

src/kube_galaxy/pkg/testing/spread.py

@@ -146,33 +146,12 @@ def _create_test_namespace(component_name: str) -> str:
     # Normalize component name for namespace (lowercase, hyphens only)
     namespace = f"kube-galaxy-test-{component_name.lower().replace('_', '-')}"
 
-    try:
-        labels = {
-            "app.kubernetes.io/managed-by": "kube-galaxy",
-            "component": component_name,
-        }
-        create_namespace(namespace, labels)
-        return namespace
-
-    except ClusterError:
-        raise
-
-
-def _cleanup_test_namespace(namespace: str, timeout: int = 60) -> None:
-    """
-    Delete test namespace and wait for termination.
-
-    Args:
-        namespace: Namespace to delete
-        timeout: Maximum seconds to wait for deletion
-
-    Raises:
-        ClusterError: If namespace deletion fails
-    """
-    try:
-        delete_namespace(namespace, timeout)
-    except ClusterError:
-        raise
+    labels = {
+        "app.kubernetes.io/managed-by": "kube-galaxy",
+        "component": component_name,
+    }
+    create_namespace(namespace, labels)
+    return namespace
 
 
 def _generate_orchestration_spread_yaml(
@@ -328,11 +307,7 @@ def _run_component_tests(
         raise ClusterError("Component validation failed")
 
     # Generate orchestration spread.yaml
-    try:
-        component_suites = _generate_orchestration_spread_yaml(spread_components, kubeconfig)
-    except ClusterError as exc:
-        error(f"Failed to generate orchestration spread.yaml: {exc}")
-        raise
+    component_suites = _generate_orchestration_spread_yaml(spread_components, kubeconfig)
 
     # Track test results
     test_results = []
@@ -390,7 +365,7 @@ def _run_component_tests(
             # Step 4: Cleanup namespace (always executed)
             if namespace:
                 try:
-                    _cleanup_test_namespace(namespace)
+                    delete_namespace(namespace)
                 except Exception as cleanup_exc:
                     warning(f"  Namespace cleanup failed: {cleanup_exc}")
 

src/kube_galaxy/pkg/utils/client.py

@@ -298,9 +298,6 @@ def get_pod_logs(namespace: str, pod_name: str, tail: int = 100) -> str:
 
     Returns:
         Pod logs as string. Returns empty string if pod has no logs.
-
-    Raises:
-        ClusterError: If logs cannot be retrieved (other than missing logs)
     """
     result = run(
         ["kubectl", "logs", "-n", namespace, pod_name, f"--tail={tail}"],

src/kube_galaxy/pkg/utils/logs.py

@@ -104,18 +104,14 @@ def _collect_pod_logs(output_path: Path) -> None:
             namespace = pod_item["metadata"]["namespace"]
             pod_name = pod_item["metadata"]["name"]
 
-            try:
-                # Get pod logs
-                log_content = get_pod_logs(namespace, pod_name, tail=100)
-
-                log_dir = pods_dir / namespace / pod_name
-                log_dir.mkdir(parents=True, exist_ok=True)
-                (log_dir / "logs.txt").write_text(log_content)
-
-                pod_count += 1
-            except ClusterError:
-                # Pod might not have logs, skip
-                pass
+            # Get pod logs
+            log_content = get_pod_logs(namespace, pod_name, tail=100)
+
+            log_dir = pods_dir / namespace / pod_name
+            log_dir.mkdir(parents=True, exist_ok=True)
+            (log_dir / "logs.txt").write_text(log_content)
+
+            pod_count += 1
 
         success(f"  Pod logs saved ({pod_count} pods)")
 

tests/unit/test_status.py

@@ -29,6 +29,8 @@ def fake_get_nodes():
     monkeypatch.setattr(status_cmd, "wait_for_pods", fake_wait_for_pods)
     monkeypatch.setattr(status_cmd, "get_context", fake_get_context)
     monkeypatch.setattr(status_cmd, "get_nodes", fake_get_nodes)
+    monkeypatch.setattr(status_cmd, "get_cluster_info", lambda: "cluster-info")
+    monkeypatch.setattr(status_cmd, "get_pods", lambda: "pods-output")
     monkeypatch.setattr(status_cmd, "_check_command", lambda _cmd: "ok")
     monkeypatch.setattr(status_cmd.shutil, "which", lambda _cmd: "/usr/bin/tool")