move dashboardPort, claudeCodePackage and extraResourceAttributes to deploy.hive-controller
These three are per-host choices that hive-c0re reads and renders into its agents, so they belong under the hive controller's deploy namespace rather than swarm-wide: - c0re.dashboardPort -> deploy.hive-controller.dashboardPort - c0re.claudeCodePackage -> deploy.hive-controller.claudeCodePackage (the claude-login and review-classifier containers on the same host keep following it) - otel.extraResourceAttributes -> deploy.hive-controller.otel.extraResourceAttributes The old paths stay as mkRenamedOptionModule aliases, now in deploy.nix with the namespace's other renames. github.enable and the collector port stay swarm-wide.
This commit is contained in:
parent
99cafa1067
commit
5bb9d7c7e5
21 changed files with 92 additions and 83 deletions
|
|
@ -12,7 +12,7 @@
|
|||
}:
|
||||
let
|
||||
cfg = config.services.hyperhive.c0re;
|
||||
swarmCfg = config.services.hyperhive.swarm;
|
||||
controllerCfg = config.services.hyperhive.deploy.hive-controller;
|
||||
|
||||
# `/run/hyperhive`'s mode. Held in one place because whichever of the two
|
||||
# units below activates first creates the directory, so they cannot be
|
||||
|
|
@ -111,8 +111,8 @@ let
|
|||
# anything that drops it. The failure mode is a garbage-collected
|
||||
# `claude` and a hive that can't take a turn, weeks after the commit
|
||||
# that caused it.
|
||||
claude_code_path = swarmCfg.claudeCodePackage;
|
||||
dashboard_port = swarmCfg.dashboardPort;
|
||||
claude_code_path = controllerCfg.claudeCodePackage;
|
||||
dashboard_port = controllerCfg.dashboardPort;
|
||||
agent_cpu_quota = cfg.agentCpuQuota;
|
||||
agent_memory_max = cfg.agentMemoryMax;
|
||||
agent_cpu_weight = cfg.agentCpuWeight;
|
||||
|
|
@ -164,10 +164,10 @@ in
|
|||
# `claude`, at whatever unrelated moment the gc runs. Cheap
|
||||
# enough to just check.
|
||||
assertion =
|
||||
swarmCfg.claudeCodePackage == null
|
||||
|| builtins.hasContext (builtins.toJSON swarmCfg.claudeCodePackage);
|
||||
controllerCfg.claudeCodePackage == null
|
||||
|| builtins.hasContext (builtins.toJSON controllerCfg.claudeCodePackage);
|
||||
message = ''
|
||||
services.hyperhive.swarm.claudeCodePackage lost its store
|
||||
services.hyperhive.deploy.hive-controller.claudeCodePackage lost its store
|
||||
context on the way into /etc/hyperhive/serve.json, so the
|
||||
package is no longer gc-rooted by the system closure and
|
||||
`nix-collect-garbage` may delete the claude every agent runs.
|
||||
|
|
|
|||
Loading…
Reference in a new issue