deploy: forward swarm.forge.ci to deploy.ci-runner, say what the forwarded enable needs
swarm.forge.ci.* were per-host options that 4423da48 had already moved to deploy.forgejo.ci.*, so they rename straight to deploy.ci-runner like the forgejo.ci ones; ciRunnerRemoved goes with its last caller.
The forwarded enable now trips deploy.ci-runner's store-identity assertion on a host with no deploy.bao.enable. The assertion names both options and the default, the doc states the requirement, and a module-eval case pins the refusal.
This commit is contained in:
parent
b114c6b165
commit
65505f5235
4 changed files with 79 additions and 45 deletions
|
|
@ -126,11 +126,20 @@ for example `"3h"` — a job that exceeds it's killed so a hung or runaway build
|
|||
can't hold the runner's single slot indefinitely).
|
||||
|
||||
The old `services.hyperhive.deploy.forgejo.ci.{enable,name,concurrency,labels,package,jobTimeout}`
|
||||
are still accepted: each is a rename of the same-named option under
|
||||
`deploy.ci-runner`, same type and meaning, and evaluation warns naming both
|
||||
paths. Set the new name to silence the warning. The two `name` defaults
|
||||
differ (`hive-ci` before, `swarm-ci-runner` now), so a host that never set the
|
||||
old `name` shows up under the new default.
|
||||
and `services.hyperhive.swarm.forge.ci.{enable,name,concurrency,labels,package}`
|
||||
are still accepted: each forwards to the same-named option under
|
||||
`deploy.ci-runner`, and evaluation warns naming both paths. Set the new name to
|
||||
silence the warning. The two `name` defaults differ (`hive-ci` before,
|
||||
`swarm-ci-runner` now), so a host that never set the old `name` shows up under
|
||||
the new default.
|
||||
|
||||
The forwarded `enable` carries the new module's requirements, not the old
|
||||
module's: a host that sets only the old `enable` is refused at evaluation
|
||||
unless `services.hyperhive.deploy.bao.ciRunnerClientCertFile` and
|
||||
`ciRunnerClientKeyFile` are both set. They default to the identity
|
||||
`glue-bao-tls.nix` mints when `services.hyperhive.deploy.bao.enable` is true;
|
||||
elsewhere place them as described under _For operators_. The runner no longer
|
||||
needs `deploy.forgejo.enable` or a hive on its host.
|
||||
|
||||
## Container design
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue