01bbf84973
Replace the per-bottle Docker sidecar bundle with the shared per-host orchestrator + gateway, mirroring what the Docker backend already has. - Add `bot_bottle/backend/firecracker/consolidated_launch.py`: `_FirecrackerOrchestratorService` (subclasses `OrchestratorService`, overrides `_gateway()` to return a `DockerGateway` with host port bindings so Firecracker VMs can reach it via their TAP link); `launch_consolidated()` registers the bottle by guest IP (attribution key), provisions git-gate into the shared gateway, and returns the shared CA + orchestrator URL for teardown; `teardown_consolidated()` deregisters and cleans up. - Rewrite `bot_bottle/backend/firecracker/launch.py`: removes the per-bottle sidecar bundle (`_start_sidecar_bundle`, `_stage_git_gate`, etc.) and `_mint_certs`; wires `launch_consolidated()` instead. The VM still sends to `host_tap_ip:PORT` — Docker's PREROUTING DNAT + the nft `ct status dnat accept` rule in the forward chain route the traffic to the shared gateway container. - Extend `DockerGateway` with `host_port_bindings` so the Firecracker gateway publishes its ports on the host (`0.0.0.0:PORT`). - Parameterise `OrchestratorService` with `orchestrator_name` / `orchestrator_label` so Docker and Firecracker orchestrators can coexist on the same host (`bot-bottle-orchestrator` vs `bot-bottle-fc-orchestrator`). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
248 lines
9.6 KiB
Python
248 lines
9.6 KiB
Python
"""Launch flow for the Firecracker backend (PRD 0070, consolidated).
|
|
|
|
Per bottle:
|
|
1. build the agent image (docker), export it to a cached ext4 rootfs;
|
|
2. ensure the per-host orchestrator + shared gateway are up;
|
|
3. claim a free TAP pool slot (rootless flock);
|
|
4. register the bottle on the orchestrator by the VM's guest IP (the
|
|
attribution key) and provision its git-gate state into the gateway;
|
|
5. boot the microVM on that TAP; wait for SSH;
|
|
6. provision (shared gateway CA, prompt, skills, workspace, git, supervise)
|
|
over SSH.
|
|
|
|
The per-bottle Docker sidecar bundle is gone. The shared gateway handles
|
|
egress / git-gate / supervise for every VM; Docker's PREROUTING DNAT routes
|
|
the VMs' traffic to it, and the nft table's `ct status dnat accept` rule
|
|
in the forward chain lets it pass. The VM still sends to `host_tap_ip:PORT`
|
|
— the address its world is, by nft design, limited to.
|
|
|
|
Isolation is enforced by the operator-provisioned nft table (checked
|
|
fail-closed in preflight): a VM reaches only the sidecar (DNAT'd from
|
|
the host TAP IP) and nothing else.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import dataclasses
|
|
import os
|
|
from contextlib import ExitStack, contextmanager
|
|
from pathlib import Path
|
|
from typing import Callable, Generator
|
|
|
|
from ...agent_provider import runtime_for
|
|
from ...bottle_state import (
|
|
egress_state_dir,
|
|
git_gate_state_dir,
|
|
read_committed_image,
|
|
)
|
|
from ...egress import (
|
|
egress_agent_env_entries,
|
|
egress_resolve_token_values,
|
|
)
|
|
from ...git_gate import (
|
|
provision_git_gate_dynamic_keys,
|
|
revoke_git_gate_provisioned_keys,
|
|
)
|
|
from ...log import info, warn
|
|
from ...supervise import SUPERVISE_PORT
|
|
from ..docker import util as docker_mod
|
|
from ..docker.egress import EGRESS_PORT
|
|
from ..util import AGENT_CA_BUNDLE, AGENT_CA_PATH
|
|
from . import firecracker_vm, isolation_probe, netpool, util
|
|
from .bottle import FirecrackerBottle
|
|
from .bottle_plan import FirecrackerBottlePlan
|
|
from .consolidated_launch import (
|
|
launch_consolidated,
|
|
teardown_consolidated,
|
|
)
|
|
|
|
|
|
_REPO_DIR = str(Path(__file__).resolve().parent.parent.parent.parent)
|
|
_GIT_HTTP_PORT = 9420
|
|
|
|
|
|
@contextmanager
|
|
def launch(
|
|
plan: FirecrackerBottlePlan,
|
|
*,
|
|
provision: Callable[[FirecrackerBottlePlan, "FirecrackerBottle"], str | None],
|
|
) -> Generator[FirecrackerBottle, None, None]:
|
|
"""Build, launch, and provision a Firecracker bottle via the consolidated
|
|
orchestrator. Teardown on exit."""
|
|
stack = ExitStack()
|
|
bottle_for_revoke = plan.manifest.bottle
|
|
git_gate_dir_for_revoke = git_gate_state_dir(plan.slug)
|
|
|
|
def teardown() -> None:
|
|
teardown_exc: BaseException | None = None
|
|
try:
|
|
stack.close()
|
|
except BaseException as exc: # noqa: W0718 - teardown must continue
|
|
teardown_exc = exc
|
|
warn(f"firecracker teardown failed: {exc!r}")
|
|
revoke_git_gate_provisioned_keys(bottle_for_revoke, git_gate_dir_for_revoke)
|
|
if teardown_exc is not None:
|
|
raise teardown_exc
|
|
|
|
try:
|
|
# Step 1: agent image. The sidecar bundle image is built by the
|
|
# orchestrator service (ensure_running → ensure_built); we only
|
|
# build the agent image here. Use a committed snapshot when available.
|
|
plan = _build_agent_image(plan)
|
|
|
|
# Step 2: mint the git-gate dynamic (gitea) deploy keys, if any.
|
|
git_gate_plan = plan.git_gate_plan
|
|
if git_gate_plan.upstreams:
|
|
git_gate_plan = provision_git_gate_dynamic_keys(
|
|
plan.manifest.bottle, git_gate_plan, git_gate_state_dir(plan.slug),
|
|
)
|
|
|
|
# Step 3: claim a TAP slot; the flock is held until teardown.
|
|
slot, lock = netpool.allocate(plan.slug)
|
|
stack.callback(lock.close)
|
|
info(f"firecracker slot {slot.iface}: host={slot.host_ip} "
|
|
f"guest={slot.guest_ip}")
|
|
|
|
# Step 4: register on the orchestrator + provision this bottle's
|
|
# git-gate state into the shared gateway. The per-bottle egress tokens
|
|
# are resolved from the host env now and handed to the orchestrator
|
|
# (in memory) for the gateway to inject — the agent never sees them.
|
|
# Attribution is by the VM's guest IP (unspoofable via /31 TAP + nft).
|
|
effective_env = {**os.environ, **plan.agent_provision.provisioned_env}
|
|
token_values = egress_resolve_token_values(
|
|
plan.egress_plan.token_env_map, effective_env,
|
|
)
|
|
ctx = launch_consolidated(
|
|
plan.egress_plan, git_gate_plan,
|
|
guest_ip=slot.guest_ip,
|
|
image_ref=plan.image,
|
|
tokens=token_values,
|
|
)
|
|
stack.callback(
|
|
teardown_consolidated, ctx.bottle_id,
|
|
orchestrator_url=ctx.orchestrator_url,
|
|
)
|
|
|
|
# Step 5: install the SHARED gateway CA (replaces the per-bottle CA).
|
|
# Write it to a stable host path so the provisioner can copy it over SSH.
|
|
ca_dir = egress_state_dir(plan.slug) / "gateway-ca"
|
|
ca_dir.mkdir(parents=True, exist_ok=True)
|
|
ca_file = ca_dir / "gateway-ca.pem"
|
|
ca_file.write_text(ctx.gateway_ca_pem)
|
|
egress_plan = dataclasses.replace(
|
|
plan.egress_plan,
|
|
mitmproxy_ca_host_path=ca_file,
|
|
mitmproxy_ca_cert_only_host_path=ca_file,
|
|
)
|
|
# Point the agent's git-gate insteadOf rewrites and supervise MCP URL
|
|
# at the shared gateway (reached at the slot's host TAP IP — the VM
|
|
# sends there and Docker DNAT routes to the gateway container).
|
|
git_gate_url = (
|
|
f"http://{slot.host_ip}:{_GIT_HTTP_PORT}" if git_gate_plan.upstreams else ""
|
|
)
|
|
supervise_url = (
|
|
f"http://{slot.host_ip}:{SUPERVISE_PORT}/"
|
|
if plan.supervise_plan is not None else ""
|
|
)
|
|
plan = dataclasses.replace(
|
|
plan,
|
|
git_gate_plan=git_gate_plan,
|
|
egress_plan=egress_plan,
|
|
agent_proxy_url=f"http://{slot.host_ip}:{EGRESS_PORT}",
|
|
agent_git_gate_url=git_gate_url,
|
|
agent_supervise_url=supervise_url,
|
|
)
|
|
|
|
# Step 6: build the per-bottle rootfs + SSH key, then boot.
|
|
base_dir = util.build_base_rootfs_dir(plan.image)
|
|
run_dir = util.cache_dir() / "run" / plan.slug
|
|
run_dir.mkdir(parents=True, exist_ok=True)
|
|
rootfs = run_dir / "rootfs.ext4"
|
|
util.build_rootfs_ext4(base_dir, rootfs)
|
|
private_key, pubkey = util.generate_keypair(run_dir)
|
|
|
|
vm = firecracker_vm.boot(
|
|
name=plan.container_name,
|
|
rootfs=rootfs,
|
|
tap=slot.iface,
|
|
guest_ip=slot.guest_ip,
|
|
host_ip=slot.host_ip,
|
|
pubkey=pubkey,
|
|
run_dir=run_dir,
|
|
)
|
|
stack.callback(vm.terminate)
|
|
firecracker_vm.wait_for_ssh(vm, private_key)
|
|
|
|
# Authoritative fail-closed egress-boundary check, before the agent
|
|
# runs: prove the VM cannot reach the host directly.
|
|
isolation_probe.verify_isolation(private_key, slot.guest_ip)
|
|
|
|
bottle = FirecrackerBottle(
|
|
plan.container_name,
|
|
private_key=private_key,
|
|
guest_ip=slot.guest_ip,
|
|
guest_env=_agent_guest_env(plan, slot.host_ip),
|
|
agent_command=plan.agent_command,
|
|
agent_prompt_mode=plan.agent_prompt_mode,
|
|
agent_provider_template=plan.agent_provider_template,
|
|
terminal_title=(
|
|
f"{plan.spec.label} ({plan.spec.agent_name})"
|
|
if plan.spec.label else plan.spec.agent_name
|
|
),
|
|
terminal_color=plan.spec.color,
|
|
agent_workdir=plan.workspace_plan.workdir,
|
|
)
|
|
bottle.prompt_path = provision(plan, bottle)
|
|
|
|
yield bottle
|
|
finally:
|
|
teardown()
|
|
|
|
|
|
def _build_agent_image(plan: FirecrackerBottlePlan) -> FirecrackerBottlePlan:
|
|
committed = read_committed_image(plan.slug)
|
|
if committed and docker_mod.image_exists(committed):
|
|
info(f"using committed image {committed!r}")
|
|
return dataclasses.replace(
|
|
plan,
|
|
agent_provision=dataclasses.replace(plan.agent_provision, image=committed),
|
|
)
|
|
docker_mod.build_image(plan.image, _REPO_DIR, dockerfile=plan.dockerfile_path)
|
|
docker_mod.verify_agent_image(
|
|
plan.image, runtime_for(plan.agent_provider_template).smoke_test,
|
|
)
|
|
return plan
|
|
|
|
|
|
# --- agent guest env -------------------------------------------------
|
|
|
|
def _agent_guest_env(plan: FirecrackerBottlePlan, host_ip: str) -> dict[str, str]:
|
|
"""Env injected into every agent/exec call over SSH. The VM has no
|
|
baked process env (it just runs init), so the proxy/CA/git/supervise
|
|
wiring is applied per-invocation."""
|
|
proxy_url = f"http://{host_ip}:{EGRESS_PORT}"
|
|
no_proxy = f"localhost,127.0.0.1,{host_ip}"
|
|
env: dict[str, str] = {
|
|
"HTTPS_PROXY": proxy_url, "HTTP_PROXY": proxy_url,
|
|
"https_proxy": proxy_url, "http_proxy": proxy_url,
|
|
"NO_PROXY": no_proxy, "no_proxy": no_proxy,
|
|
"NODE_EXTRA_CA_CERTS": AGENT_CA_PATH,
|
|
"SSL_CERT_FILE": AGENT_CA_BUNDLE,
|
|
"REQUESTS_CA_BUNDLE": AGENT_CA_BUNDLE,
|
|
}
|
|
if plan.agent_git_gate_url:
|
|
env["GIT_GATE_URL"] = plan.agent_git_gate_url
|
|
if plan.agent_supervise_url:
|
|
env["MCP_SUPERVISE_URL"] = plan.agent_supervise_url
|
|
for entry in egress_agent_env_entries(plan.egress_plan):
|
|
key, _, value = entry.partition("=")
|
|
env[key] = value
|
|
env.update(plan.agent_provision.guest_env)
|
|
# Forwarded (bare-name) env: resolve host values now, since the VM
|
|
# can't inherit them from a `docker run --env NAME`.
|
|
for name in plan.forwarded_env:
|
|
value = os.environ.get(name)
|
|
if value is not None:
|
|
env[name] = value
|
|
return env
|