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

nix: require swarm.domain on every host

Browse source 
Swarm options are the same on all hosts, so the swarm.domain assertion is no longer gated on deploy.hive-controller.enable.

Refs #4872
This commit is contained in:
atlas 2026-10-02 08:12:46 +02:00 • committed by mara
commit 82463388c5
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

25
nix/host-modules/hive-network.nix
View file

@ -184,21 +184,28 @@ in
backstop. backstop.
''; '';
} }
];
})
# Un-gated: the swarm's options are identical on every host, so a host
# running no hive and no swarm service needs the value too. The
# `.invalid` fallbacks described above keep this message reachable.
{
assertions = [
{ {
assertion = config.services.hyperhive.swarm.domain != null; assertion = config.services.hyperhive.swarm.domain != null;
message = '' message = ''
hyperhive requires services.hyperhive.swarm.domain to be hyperhive requires services.hyperhive.swarm.domain to be set
set — the DNS domain of the swarm this hive belongs to, on every host, to the same value on every host of the swarm —
of which this hive occupies one sub-domain. There is no the DNS domain of the swarm, of which each hive occupies one
fallback: a guessed value would be a wrong hostname that sub-domain. There is no fallback: a guessed value would be a
evaluates cleanly and deploys. Set it wrong hostname that evaluates cleanly and deploys. Set it
(`services.hyperhive.swarm.domain = "example.com";`) — (`services.hyperhive.swarm.domain = "example.com";`) — with
with `hiveName` it also derives `hiveName` it also derives `services.hyperhive.domain` for you.
`services.hyperhive.domain` for you.
''; '';
} }
]; ];
}) }
# The bridge itself, up only where something hangs off it. Private # The bridge itself, up only where something hangs off it. Private
# netns is still the only container mode. # netns is still the only container mode.

6
nix/host-modules/hyperhive.nix
View file

@ -117,9 +117,9 @@ in
`services.hyperhive.hiveName`, list the hives by name, and no `services.hyperhive.hiveName`, list the hives by name, and no
hive in the swarm states an address at all. hive in the swarm states an address at all.
**Required** when **Required** on every host that imports this module, with the
`services.hyperhive.deploy.hive-controller.enable`, and deliberately same value on every host of the swarm, and deliberately not
not defaulted: there is no fallback worth having. A guessed defaulted: there is no fallback worth having. A guessed
swarm domain is a wrong hostname that evaluates cleanly and swarm domain is a wrong hostname that evaluates cleanly and
deploys, which is worse than an eval failure telling an deploys, which is worse than an eval failure telling an
operator to write down the one address their swarm answers to. operator to write down the one address their swarm answers to.