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
|
|
@ -96,7 +96,7 @@ in
|
|||
nixpkgs.
|
||||
|
||||
Set by the generated meta flake when the operator sets
|
||||
`services.hyperhive.swarm.claudeCodePackage` host-side, so a swarm
|
||||
`services.hyperhive.deploy.hive-controller.claudeCodePackage` host-side, so a hive
|
||||
can run a claude built from a *different* nixpkgs than the one
|
||||
its agents evaluate against — a release channel can trail
|
||||
unstable by weeks on this one package. It arrives as a path and
|
||||
|
|
@ -109,7 +109,7 @@ in
|
|||
there is only ever one claude in the container. Note that neither
|
||||
the symlink nor anything else in the container's closure *refers*
|
||||
to the target — keeping it alive is the host's job, see
|
||||
`services.hyperhive.swarm.claudeCodePackage`.
|
||||
`services.hyperhive.deploy.hive-controller.claudeCodePackage`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
@ -255,7 +255,7 @@ in
|
|||
# The symlink registers no store reference — the target isn't
|
||||
# among this derivation's inputs, so nothing here keeps the
|
||||
# binary alive. That is deliberate and it is the host's job:
|
||||
# see `services.hyperhive.swarm.claudeCodePackage`.
|
||||
# see `services.hyperhive.deploy.hive-controller.claudeCodePackage`.
|
||||
pkgs.runCommandLocal "claude-code-pinned" { } ''
|
||||
mkdir -p "$out/bin"
|
||||
ln -s ${config.services.hyperhive.agent.claudeCodePath}/bin/claude "$out/bin/claude"
|
||||
|
|
|
|||
|
|
@ -125,7 +125,8 @@ in
|
|||
Extra comma-separated entries appended to
|
||||
`OTEL_RESOURCE_ATTRIBUTES` after the built-in
|
||||
`service.name` / `agent` / `swarm` labels.
|
||||
Host-driven via `services.hyperhive.swarm.hiveOtel.extraResourceAttributes`.
|
||||
Host-driven via
|
||||
`services.hyperhive.deploy.hive-controller.otel.extraResourceAttributes`.
|
||||
'';
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue