didericis
4a607ad098
Adopts the firecracker infra-VM pattern for macOS: the orchestrator control plane and the gateway data plane now run in a SINGLE Apple container instead of two. Apple Containers are lightweight VMs with separate kernels, so the prior two-container design had both guests writing one bot-bottle.db over virtiofs, where fcntl locks are not coherent across kernels — concurrent writes (the orchestrator's registry vs the gateway supervise daemon's queue) could corrupt it. One container = one kernel = coherent locking. The DB moves onto a container-only Apple volume (bot-bottle-mac-db), never bind-mounted from the host, so no host process opens the live file either. The host CLI already reaches registry + supervise state over the control-plane HTTP surface (cli/supervise.py uses OrchestratorClient), exactly as firecracker's VM-only DB requires. Two simplifications fall out of the single container: - No DNS dance: the control plane and gateway daemons reach each other over 127.0.0.1, so the orchestrator-before-gateway ordering (a workaround for Apple having no container DNS) is gone, along with the moved-IP recreate logic it needed. - Net -243 lines. Mechanics: the infra container runs from the gateway image with the control-plane source bind-mounted read-only (like the docker orchestrator, so a code change needs no rebuild) and a small sh -c init that starts both processes (mirrors firecracker's _infra_init). Also implements the macOS backend's ensure_orchestrator() and adds it to discover_orchestrator_url, so operator tools (supervise) can bring up / find the control plane on demand — previously the macOS backend died with "no orchestrator control plane". Verified end-to-end on real Apple Container 1.0.0: the single infra container comes up healthy (one address for control plane + gateway), both processes run, the DB is written on the container-only volume, host-side supervise works over HTTP, and a registered agent gets 200 for an allowed host / 403 for a denied one. 1824 unit tests pass with `container` absent (CI parity), pyright clean, pylint 9.89. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
45 lines
1.6 KiB
Python
45 lines
1.6 KiB
Python
"""`GatewayTransport` for the Apple infra container (PRD 0070).
|
|
|
|
The provisioning *logic* (per-bottle creds dirs, namespaced repo init) is
|
|
backend-neutral and lives in `backend.docker.gateway_provision`; this is only
|
|
the transport — how files and commands reach the running gateway. Docker uses
|
|
`docker exec`/`docker cp` and Firecracker uses SSH; Apple uses the `container`
|
|
CLI's equivalents against the infra container that hosts the gateway daemons.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
from ..docker.gateway_provision import GatewayProvisionError
|
|
from . import util as container_mod
|
|
from .infra import INFRA_NAME
|
|
|
|
|
|
class AppleGatewayTransport:
|
|
"""`GatewayTransport` for the gateway daemons in the Apple infra container."""
|
|
|
|
def __init__(self, gateway: str = INFRA_NAME) -> None:
|
|
self.gateway = gateway
|
|
|
|
def exec(self, argv: list[str]) -> None:
|
|
result = container_mod.run_container_argv(
|
|
["container", "exec", self.gateway, *argv]
|
|
)
|
|
if result.returncode != 0:
|
|
raise GatewayProvisionError(
|
|
f"gateway exec {argv!r} failed: "
|
|
f"{(result.stderr or '').strip() or '<no stderr>'}"
|
|
)
|
|
|
|
def cp_into(self, src: str, dest: str) -> None:
|
|
result = container_mod.run_container_argv(
|
|
["container", "cp", src, f"{self.gateway}:{dest}"]
|
|
)
|
|
if result.returncode != 0:
|
|
raise GatewayProvisionError(
|
|
f"gateway cp {src} -> {dest} failed: "
|
|
f"{(result.stderr or '').strip() or '<no stderr>'}"
|
|
)
|
|
|
|
|
|
__all__ = ["AppleGatewayTransport", "GatewayProvisionError"]
|