move fork-observer and caddy into warnet-logging namespace

Author: willcl-ark

src/warnet/constants.py

@@ -12,6 +12,7 @@
 ]
 
 DEFAULT_NAMESPACE = "warnet"
+LOGGING_NAMESPACE = "warnet-logging"
 HELM_COMMAND = "helm upgrade --install --create-namespace"
 
 # Directories and files for non-python assets, e.g., helm charts, example scenarios, default configs

src/warnet/control.py

@@ -14,7 +14,7 @@
 from rich.prompt import Confirm, Prompt
 from rich.table import Table
 
-from .constants import COMMANDER_CHART
+from .constants import COMMANDER_CHART, LOGGING_NAMESPACE
 from .deploy import _port_stop_internal
 from .k8s import (
     get_default_namespace,
@@ -130,7 +130,7 @@ def down():
     """Bring down a running warnet quickly"""
     console.print("[bold yellow]Bringing down the warnet...[/bold yellow]")
 
-    namespaces = [get_default_namespace(), "warnet-logging"]
+    namespaces = [get_default_namespace(), LOGGING_NAMESPACE]
 
     def uninstall_release(namespace, release_name):
         cmd = f"helm uninstall {release_name} --namespace {namespace} --wait=false"
@@ -164,7 +164,7 @@ def delete_pod(pod_name, namespace):
             console.print(f"[yellow]{future.result()}[/yellow]")
 
     # Shutdown any port forwarding
-    _port_stop_internal()
+    _port_stop_internal("caddy", namespaces[1])
     console.print("[bold yellow]Teardown process initiated for all components.[/bold yellow]")
     console.print("[bold yellow]Note: Some processes may continue in the background.[/bold yellow]")
     console.print("[bold green]Warnet teardown process completed.[/bold green]")

src/warnet/deploy.py

@@ -15,6 +15,7 @@
     FORK_OBSERVER_CHART,
     HELM_COMMAND,
     LOGGING_HELM_COMMANDS,
+    LOGGING_NAMESPACE,
     NAMESPACES_CHART_LOCATION,
     NAMESPACES_FILE,
     NETWORK_FILE,
@@ -100,12 +101,14 @@ def deploy_caddy(directory: Path, debug: bool):
     with network_file_path.open() as f:
         network_file = yaml.safe_load(f)
 
+    namespace = LOGGING_NAMESPACE
+    # TODO: get this from the helm chart
+    name = "caddy"
+
     # Only start if configured in the network file
-    if not network_file.get("fork_observer", {}).get("enabled", False):
+    if not network_file.get(name, {}).get("enabled", False):
         return
 
-    namespace = get_default_namespace()
-    name = "caddy"
     cmd = f"{HELM_COMMAND} {name} {CADDY_CHART} --namespace {namespace}"
     if debug:
         cmd += " --debug"
@@ -115,7 +118,7 @@ def deploy_caddy(directory: Path, debug: bool):
         return
 
     wait_for_caddy_ready(name, namespace)
-    _port_start_internal()
+    _port_start_internal(name, namespace)
 
 
 def deploy_fork_observer(directory: Path, debug: bool):
@@ -127,7 +130,8 @@ def deploy_fork_observer(directory: Path, debug: bool):
     if not network_file.get("fork_observer", {}).get("enabled", False):
         return
 
-    namespace = get_default_namespace()
+    default_namespace = get_default_namespace()
+    namespace = LOGGING_NAMESPACE
     cmd = f"{HELM_COMMAND} 'fork-observer' {FORK_OBSERVER_CHART} --namespace {namespace}"
     if debug:
         cmd += " --debug"
@@ -143,7 +147,7 @@ def deploy_fork_observer(directory: Path, debug: bool):
 id = {i}
 name = "{node_name}"
 description = "A node. Just A node."
-rpc_host = "{node_name}"
+rpc_host = "{node_name}.{default_namespace}.svc"
 rpc_port = 18443
 rpc_user = "forkobserver"
 rpc_password = "tabconf2024"
@@ -275,17 +279,17 @@ def run_detached_process(command):
     print(f"Started detached process: {command}")
 
 
-def _port_start_internal():
-    command = "kubectl port-forward service/caddy 2019:80"
+def _port_start_internal(name, namespace):
+    command = f"kubectl port-forward -n {namespace} service/{name} 2019:80"
     run_detached_process(command)
     click.echo(
         "Port forwarding on port 2019 started in the background. To access landing page visit localhost:2019."
     )
 
 
-def _port_stop_internal():
+def _port_stop_internal(name, namespace):
     if is_windows():
         os.system("taskkill /F /IM kubectl.exe")
     else:
-        os.system("pkill -f 'kubectl port-forward service/caddy-service 2019:80'")
+        os.system(f"pkill -f 'kubectl port-forward -n {namespace} service/{name} 2019:80'")
     click.echo("Port forwarding stopped.")

src/warnet/graph.py

@@ -33,6 +33,7 @@ def custom_graph(
     datadir: Path,
     fork_observer: bool,
     fork_obs_query_interval: int,
+    caddy: bool,
 ):
     datadir.mkdir(parents=False, exist_ok=False)
     # Generate network.yaml
@@ -68,6 +69,9 @@ def custom_graph(
         "enabled": fork_observer,
         "configQueryInterval": fork_obs_query_interval,
     }
+    network_yaml_data["caddy"] = {
+        "enabled": caddy,
+    }
 
     with open(os.path.join(datadir, "network.yaml"), "w") as f:
         yaml.dump(network_yaml_data, f, default_flow_style=False)
@@ -180,6 +184,7 @@ def inquirer_create_network(project_path: Path):
         custom_network_path,
         fork_observer,
         fork_observer_query_interval,
+        fork_observer, # This enables caddy whenever fork-observer is enabled
     )
     return custom_network_path
 

src/warnet/project.py

@@ -1,17 +1,14 @@
 import os
 import platform
-import random
 import subprocess
 import sys
 from dataclasses import dataclass
 from enum import Enum, auto
-from importlib.resources import files
 from pathlib import Path
 from typing import Callable
 
 import click
 import inquirer
-import yaml
 
 from .graph import inquirer_create_network
 from .network import copy_network_defaults, copy_scenario_defaults
@@ -319,62 +316,3 @@ def init():
     """Initialize a warnet project in the current directory"""
     current_dir = Path.cwd()
     new_internal(directory=current_dir, from_init=True)
-
-
-def custom_graph(
-    num_nodes: int,
-    num_connections: int,
-    version: str,
-    datadir: Path,
-    fork_observer: bool,
-    fork_obs_query_interval: int,
-):
-    datadir.mkdir(parents=False, exist_ok=False)
-    # Generate network.yaml
-    nodes = []
-    connections = set()
-
-    for i in range(num_nodes):
-        node = {"name": f"tank-{i:04d}", "connect": [], "image": {"tag": version}}
-
-        # Add round-robin connection
-        next_node = (i + 1) % num_nodes
-        node["connect"].append(f"tank-{next_node:04d}")
-        connections.add((i, next_node))
-
-        # Add random connections
-        available_nodes = list(range(num_nodes))
-        available_nodes.remove(i)
-        if next_node in available_nodes:
-            available_nodes.remove(next_node)
-
-        for _ in range(min(num_connections - 1, len(available_nodes))):
-            random_node = random.choice(available_nodes)
-            # Avoid circular loops of A -> B -> A
-            if (random_node, i) not in connections:
-                node["connect"].append(f"tank-{random_node:04d}")
-                connections.add((i, random_node))
-                available_nodes.remove(random_node)
-
-        nodes.append(node)
-
-    network_yaml_data = {"nodes": nodes}
-    network_yaml_data["fork_observer"] = {
-        "enabled": fork_observer,
-        "configQueryInterval": fork_obs_query_interval,
-    }
-
-    with open(os.path.join(datadir, "network.yaml"), "w") as f:
-        yaml.dump(network_yaml_data, f, default_flow_style=False)
-
-    # Generate node-defaults.yaml
-    default_yaml_path = files("resources.networks").joinpath("node-defaults.yaml")
-    with open(str(default_yaml_path)) as f:
-        defaults_yaml_content = f.read()
-
-    with open(os.path.join(datadir, "node-defaults.yaml"), "w") as f:
-        f.write(defaults_yaml_content)
-
-    click.echo(
-        f"Project '{datadir}' has been created with 'network.yaml' and 'node-defaults.yaml'."
-    )