From f716e9d167cfb194f764d751b8f3bfa086641020 Mon Sep 17 00:00:00 2001 From: Keith Jackson Date: Thu, 1 Oct 2026 21:01:16 -0500 Subject: [PATCH] chore(decisions): record the rebase onto main @ 08deb20 The render.py conflict was textual adjacency with PR #28's constants block, not a semantic one. Both sides kept. Co-Authored-By: Claude Opus 5 (1M context) --- .../2026-09-30-sd-hardware-capability.md | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/decisions/2026-09-30-sd-hardware-capability.md b/decisions/2026-09-30-sd-hardware-capability.md index dcc5562..5157934 100644 --- a/decisions/2026-09-30-sd-hardware-capability.md +++ b/decisions/2026-09-30-sd-hardware-capability.md @@ -73,6 +73,26 @@ hostPath mount stalls the entire app tier for the sake of a feature that is not `/dev` is tmpfs, so the empty directory the kubelet creates on such a node leaves nothing durable behind. Do not "tighten" it to `Directory`. The reasoning is recorded at the emission site. +### Rebase note (2026-10-01, Ruth Okonkwo) — resolution only, no redesign + +Rebased onto `main` @ `08deb20` (was cut from `0fbf544`). Re-landed as a single cherry-pick onto +current `main`; the branch ref was force-updated with `--force-with-lease`, so PR #27 is the same +PR with a new head. + +**One conflict, in `catalog/render.py`, purely textual.** PR #28 +(`fix/oauth2-proxy-cookie-collision-fleet`, merged as `6caa5f2`) inserted its own constants blocks +(`OAUTH2_ACCESS_TOKEN_LIFETIME_S` / `OAUTH2_COOKIE_REFRESH`, and `OAUTH2_PROXY_METRICS_PORT`) at the +same insertion point immediately after `KEYCLOAK_ISSUER` that this branch used for +`DRI_VOLUME_NAME` / `DRI_DEVICE_DIR`. The two blocks are unrelated and do not interact, so **both +sides were kept in full**, oauth2-proxy's first and the hardware block after it. Nothing was +dropped and nothing was rewritten: the rebased commit adds the **same 126 `render.py` lines** as the +pre-rebase commit (verified by comparing the added-line sets) and deletes none. In particular the +`supplementalGroups`-is-deliberately-not-emitted and `DirectoryOrCreate`-is-load-bearing comments +survive verbatim. + +Re-verified after the resolution: `--selftest` PASS (rc 0), and a full re-render still produces a +**zero** diff in `apps/` — this PR remains inert, as it must be while no ServiceDefinition opts in. + ## What I verified Measured, in this worktree, on this branch: