vinzenz/hyperhive
vinzenz/hyperhive
Watch
0
0
Fork
You've already forked hyperhive
 0
Code Activity

move hiveName to deploy.hive-controller; only a hive host needs a name

Browse source
This commit is contained in:
atlas 2026-10-26 16:06:11 +01:00 • committed by mara
commit 0c6e8fc5a2
37 changed files with 402 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/host-modules/otel.nix
View file

@ -48,7 +48,7 @@ let
# Where `swarm-bao-hive-otel-oidc` lands the secret on this host.
hiveOtelSecret = import ./lib/hive-otel-secret.nix {
inherit (config.services.hyperhive.swarm.authelia) hiveClientPrefix;
inherit (config.services.hyperhive) hiveName;
inherit (config.services.hyperhive.deploy.hive-controller) hiveName;
};
fetchedSecretPath = hiveOtelSecret.path;
in
@ -190,7 +190,10 @@ in
clientSecretFile = lib.mkOption {
type = lib.types.nullOr lib.types.str;
default =
if hiveLeaf && config.services.hyperhive.hiveName != null then fetchedSecretPath else null;
if hiveLeaf && config.services.hyperhive.deploy.hive-controller.hiveName != null then
fetchedSecretPath
else
null;
defaultText = lib.literalExpression ''"/run/hive-otel-oidc/''${swarm.authelia.hiveClientPrefix}''${hiveName}.secret" when deploy.bao.clientCertFile and clientKeyFile are set, else null'';
example = "/var/lib/secrets/hive-telemetry.secret";
description = ''
@ -256,7 +259,7 @@ in
deployCfg = config.services.hyperhive.deploy;
swarmOtelCfg = config.services.hyperhive.swarm.otel;
hiveOtelCfg = config.services.hyperhive.swarm.hiveOtel;
hiveName = config.services.hyperhive.hiveName;
hiveName = config.services.hyperhive.deploy.hive-controller.hiveName;
listen = "${config.services.hyperhive.network.bridgeIp}:${toString hiveOtelCfg.collectorPort}";
swarmName = "otlphttp/swarm";
gatewayCfg = config.services.hyperhive.gateway;
@ -884,7 +887,9 @@ in
services.hyperhive.otel.clientSecretFile = ${
if otel.clientSecretFile == null then "null" else otel.clientSecretFile
}
services.hyperhive.hiveName = ${if hiveName == null then "null" else hiveName}
services.hyperhive.deploy.hive-controller.hiveName = ${
if hiveName == null then "null" else hiveName
}
Every hive authenticates as itself — that is what makes the
`hive` label on its metrics mean anything — so both are