A controller test judges the runtime's daemon.json by the docker module's own keys, not live-restore alone (issue 498) #229

Merged
mesh-admin merged 1 commits from fix/498-docker-gives-log-rotation-too into main 2026-10-11 16:52:51 +00:00
Contributor

Fixes novox/hq issue 498: every controller pull request's repo-check fails in TestTheResolverAndWhatAsksItComposeOnOneMachine, because the test pinned the docker module's daemon.json to live-restore alone and the module gives log rotation too since mesh-catalog #205 and #217 (issue 452).

Why it said "nothing else". Commit c978aa7 and then 1f4c67a (ADR 0196) moved dns out of daemon.json: a container copies its machine's resolvers. The exact-length check held that line, so dns could not come back.

What it asserts now (only internal/catalogue/resolver_manifests_test.go changes):

  • live-restore is true.
  • dns is never given (ADR 0196), named explicitly.
  • No key appears that the docker module's own daemon.json does not declare: the allowed keys are read from the manifest, so a key that a settings layer or another module adds still fails.
  • Where the module declares log-driver, the runtime gets json-file with max-size 100m and max-file "10". The copy in testdata/beside predates log rotation, so outside a merge check that part has nothing to judge.

Proof

  • go vet ./... passes. go test ./internal/catalogue/ -count=1 passes against the captured copy, and with MESH_CHECK_BESIDE set to a clone of mesh-catalog main at 58f077e.
  • When a stray debug key is put into the composed keys, the test fails: "the runtime is given "debug", which the docker module does not declare".
  • When a catalogue's daemon.json carries dns and log-max-size defaults to 50m, the test fails on both.
Fixes novox/hq issue 498: every controller pull request's repo-check fails in `TestTheResolverAndWhatAsksItComposeOnOneMachine`, because the test pinned the docker module's daemon.json to `live-restore` alone and the module gives log rotation too since mesh-catalog #205 and #217 (issue 452). **Why it said "nothing else".** Commit c978aa7 and then 1f4c67a (ADR 0196) moved `dns` out of daemon.json: a container copies its machine's resolvers. The exact-length check held that line, so `dns` could not come back. **What it asserts now** (only `internal/catalogue/resolver_manifests_test.go` changes): - `live-restore` is true. - `dns` is never given (ADR 0196), named explicitly. - No key appears that the docker module's own daemon.json does not declare: the allowed keys are read from the manifest, so a key that a settings layer or another module adds still fails. - Where the module declares `log-driver`, the runtime gets `json-file` with `max-size` 100m and `max-file` "10". The copy in testdata/beside predates log rotation, so outside a merge check that part has nothing to judge. **Proof** - `go vet ./...` passes. `go test ./internal/catalogue/ -count=1` passes against the captured copy, and with `MESH_CHECK_BESIDE` set to a clone of mesh-catalog main at 58f077e. - When a stray `debug` key is put into the composed keys, the test fails: "the runtime is given \"debug\", which the docker module does not declare". - When a catalogue's daemon.json carries `dns` and `log-max-size` defaults to 50m, the test fails on both.
mesh-admin added 1 commit 2026-10-11 16:46:43 +00:00
Judge the runtime's daemon.json against the docker module's own keys, not a frozen copy
mesh/merge-gate pass: the change touches no module of the mesh's graph
mesh/repo-check pass: its merge-check.sh passed
mesh/delivery delivered
483c387b72
The test pinned daemon.json to live-restore alone, so every controller check failed once the
docker module gained log rotation as a preference (mesh-catalog #205, #217). It still refuses
dns (ADR 0196) and any key the module does not declare, and checks the log defaults where the
module declares them (novox/hq issue 498).
Author
Contributor

Delivery novox/mesh-controller@483c387b7249 — delivered since 2026-10-11T16:53:23Z

Delivery plan — builds nothing: the change touches no module of the mesh's graph

Transitions

  • 2026-10-11 16:46 (new) → proposed (announced): novox/mesh-controller#229's head announced
  • 2026-10-11 16:51 proposed → checked (checked): the verdict names this commit
  • 2026-10-11 16:51 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail
  • 2026-10-11 16:53 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move
  • 2026-10-11 16:53 published → delivered (done): nothing for a walk to move

The commit's note under refs/notes/mesh-plan keeps every transition: git log --notes=mesh-plan.

<!-- mesh-delivery:view --> **Delivery** `novox/mesh-controller@483c387b7249` — **delivered** since 2026-10-11T16:53:23Z **Delivery plan** — builds nothing: the change touches no module of the mesh's graph **Transitions** - 2026-10-11 16:46 (new) → proposed (announced): novox/mesh-controller#229's head announced - 2026-10-11 16:51 proposed → checked (checked): the verdict names this commit - 2026-10-11 16:51 checked → ready (accepted): the gate passed or warned, and the repository's own check did not fail - 2026-10-11 16:53 ready → published (merged): on the trunk its modules follow: merged there, and its walk opened — or nothing for a walk to move - 2026-10-11 16:53 published → delivered (done): nothing for a walk to move The commit's note under `refs/notes/mesh-plan` keeps every transition: `git log --notes=mesh-plan`.
mesh-admin merged commit 9edc5c758d into main 2026-10-11 16:52:51 +00:00
mesh-admin deleted branch fix/498-docker-gives-log-rotation-too 2026-10-11 16:52:51 +00:00
This repo is archived. You cannot comment on pull requests.
No Reviewers
1 Participants
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: novox/mesh-controller#229