add caddy readiness check and auto-port-forward

Author: willcl-ark

resources/manifests/caddy/caddy-configmap.yaml

@@ -8,6 +8,9 @@ data:
       debug
     }
     :80 {
+      respond /live 200
+      respond /ready 200
+
       root * /usr/share/caddy
       file_server
 

resources/manifests/caddy/caddy-deployment.yaml

@@ -17,6 +17,18 @@ spec:
         image: caddy:2.8.4
         ports:
         - containerPort: 80
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 80
+          initialDelaySeconds: 10
+          periodSeconds: 5
+        livenessProbe:
+          httpGet:
+            path: /live
+            port: 80
+          initialDelaySeconds: 15
+          periodSeconds: 10
         volumeMounts:
         - name: caddy-config
           mountPath: /etc/caddy/Caddyfile

src/warnet/control.py

@@ -10,6 +10,7 @@
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
+from .deploy import _port_stop_internal
 from .k8s import (
     apply_kubernetes_yaml,
     delete_all_resources,
@@ -118,6 +119,7 @@ def down():
     console.print("[green]Warnet logging cleaned up[/green]")
     delete_all_resources()
     console.print("[bold green]Warnet has been brought down.[/bold green]")
+    _port_stop_internal()
 
 
 def get_active_network(namespace):

src/warnet/deploy.py

@@ -1,3 +1,6 @@
+import os
+import subprocess
+import sys
 import tempfile
 from pathlib import Path
 
@@ -63,6 +66,7 @@ def deploy(directory, debug):
         click.echo(
             "Error: Neither network.yaml nor namespaces.yaml found in the specified directory."
         )
+    _port_start_internal()
 
 
 def deploy_fork_observer(directory: Path, debug: bool):
@@ -198,3 +202,43 @@ def deploy_namespaces(directory: Path):
         finally:
             if temp_override_file_path.exists():
                 temp_override_file_path.unlink()
+
+
+def is_windows():
+    return sys.platform.startswith("win")
+
+
+def run_detached_process(command):
+    if is_windows():
+        # For Windows, use CREATE_NEW_PROCESS_GROUP and DETACHED_PROCESS
+        subprocess.Popen(
+            command,
+            shell=True,
+            stdin=None,
+            stdout=None,
+            stderr=None,
+            close_fds=True,
+            creationflags=subprocess.CREATE_NEW_PROCESS_GROUP | subprocess.DETACHED_PROCESS,
+        )
+    else:
+        # For Unix-like systems, use nohup and redirect output
+        command = f"nohup {command} > /dev/null 2>&1 &"
+        subprocess.Popen(command, shell=True, stdin=None, stdout=None, stderr=None, close_fds=True)
+
+    print(f"Started detached process: {command}")
+
+
+def _port_start_internal():
+    command = "kubectl port-forward service/caddy-service 2019:80"
+    run_detached_process(command)
+    print(
+        "Port forwarding on port 2019 started in the background. Use 'warcli' (or 'kubectl') to manage the warnet."
+    )
+
+
+def _port_stop_internal():
+    if is_windows():
+        os.system("taskkill /F /IM kubectl.exe")
+    else:
+        os.system("pkill -f 'kubectl port-forward service/caddy-service 2019:80'")
+    print("Port forwarding stopped.")

src/warnet/k8s.py

@@ -1,5 +1,6 @@
 import json
 import tempfile
+import time
 from pathlib import Path
 
 import yaml
@@ -233,6 +234,7 @@ def deploy_caddy(directory: Path):
                     elif kind == "Deployment":
                         apps_v1.create_namespaced_deployment(namespace, doc)
                         print(f"Created Deployment: {name}")
+                        wait_for_caddy_ready(name, namespace)
                     elif kind == "Service":
                         core_v1.create_namespaced_service(namespace, doc)
                         print(f"Created Service: {name}")
@@ -250,6 +252,7 @@ def deploy_caddy(directory: Path):
                             core_v1.replace_namespaced_config_map(name, namespace, doc)
                         elif kind == "Deployment":
                             apps_v1.replace_namespaced_deployment(name, namespace, doc)
+                            wait_for_caddy_ready(name, namespace)
                         elif kind == "Service":
                             core_v1.replace_namespaced_service(name, namespace, doc)
                         else:
@@ -262,3 +265,23 @@ def deploy_caddy(directory: Path):
                         print(f"Error creating/updating {kind} {name}: {e}")
 
     print("Caddy deployment completed.")
+
+
+def wait_for_caddy_ready(name: str, namespace: str, timeout: int = 300):
+    apps_v1 = client.AppsV1Api()
+    start_time = time.time()
+
+    while True:
+        try:
+            deployment = apps_v1.read_namespaced_deployment(name, namespace)
+            if deployment.status.ready_replicas == deployment.spec.replicas:
+                print(f"Caddy deployment {name} is ready")
+                return True
+        except ApiException as e:
+            print(f"Error checking Caddy deployment {name}: {e}")
+
+        if time.time() - start_time > timeout:
+            print(f"Timeout waiting for Caddy deployment {name} to be ready")
+            return False
+
+        time.sleep(0.1)