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
|
|
@ -54,7 +54,8 @@ pub struct Coordinator {
|
|||
pub nixpkgs_flake: String,
|
||||
/// Store path of the `claude-code` build every agent runs, written
|
||||
/// into each per-agent flake as `services.hyperhive.agent.claudeCodePath`. Set by
|
||||
/// the NixOS module option `services.hyperhive.swarm.claudeCodePackage`
|
||||
/// the NixOS module option
|
||||
/// `services.hyperhive.deploy.hive-controller.claudeCodePackage`
|
||||
/// (which resolves the package and hands us its path). `None` = every
|
||||
/// agent keeps the `claude-code` from its own nixpkgs.
|
||||
///
|
||||
|
|
|
|||
|
|
@ -551,8 +551,9 @@ fn hive_ca_source() -> Option<String> {
|
|||
}
|
||||
|
||||
/// Hive-wide OTEL config injected into every agent's build, read off
|
||||
/// hive-c0re's own unit env (set from `services.hyperhive.otel.*` and
|
||||
/// `services.hyperhive.swarm.hiveOtel.*`). A present, non-empty
|
||||
/// hive-c0re's own unit env (set from `services.hyperhive.otel.*`,
|
||||
/// `services.hyperhive.swarm.hiveOtel.*` and
|
||||
/// `services.hyperhive.deploy.hive-controller.otel.*`). A present, non-empty
|
||||
/// `HYPERHIVE_OTEL_ENDPOINT` is the enable signal — the host module
|
||||
/// asserts the endpoint is set whenever `otel.enable` is true, so
|
||||
/// "endpoint present" == "OTEL on". The optional fields map to the
|
||||
|
|
|
|||
|
|
@ -347,8 +347,8 @@ fn attrs(c: &ContainerResource) -> Vec<KeyValue> {
|
|||
|
||||
/// Resource: `service.name = hyperhive-c0re`, the host architecture, the
|
||||
/// running hyperhive revision, plus whatever the operator set in
|
||||
/// `swarm.hiveOtel.extraResourceAttributes` (swarm-wide labels, same channel
|
||||
/// the agent-side export uses; the `hive` label is stamped by the swarm
|
||||
/// `deploy.hive-controller.otel.extraResourceAttributes` (same channel the
|
||||
/// agent-side export uses; the `hive` label is stamped by the swarm
|
||||
/// collector, not set here).
|
||||
///
|
||||
/// These belong on the resource rather than on each data point for the same
|
||||
|
|
|
|||
Loading…
Reference in a new issue