Skip to content

fix: gating-safe waves for every cluster group (review PR for #165, part 1) - #4

Merged
butler54 merged 1 commit into
feat/t1-airgap-hardeningfrom
fix/airgap-connected-default
Nov 19, 2026
Merged

butler54 merged 1 commit into
feat/t1-airgap-hardeningfrom
fix/airgap-connected-default

Conversation

@butler54

Copy link
Copy Markdown
Owner

DRAFT — review PR. Do not merge until the R review gate and the V1–V3 lab runs pass. Base is the validatedpatterns#165 branch, so this diff is exactly this round's work.

What this PR is

Fork-internal review PR for the work closing out validatedpatterns#165. Base is the validatedpatterns#165 branch feat/t1-airgap-hardening (at 7efafc8), so the diff below is exactly this round's work, not the 684-line validatedpatterns#165 delta. It folds back into validatedpatterns#165 after the review gate and lab validation pass.

Design rule: the committed tree must be a working connected install with zero operator edits. Every disconnected delta stays an overlay scalar or a documented deploy-time value. The one permitted base-file exception is the acm.mce_operator.source tpl-conditional (Helm replaces lists, so an overlay list would drop future base entries).

Why

main.gitops.applicationHealthCheckEnabled: "true" is global, so sync-wave gating is ON for every cluster group — but the escape hatches that make a gated first sync work (wave −1 RBAC bridge, wave-15 acm, wave-5 vault hook) existed only in values-baremetal.yaml. values-baremetal-hub.yaml deadlocked deterministically; every other group was exposed to the wave-0 imperative-SA race. Separately, a connected baremetal-spoke was being pointed at a mirrored catalog that only exists in airgap.

Status

Stage State
S0 baseline (golden renders, all 6 cluster groups @ 7efafc8) ✅
S1 gating-safe waves for all cluster groups ✅ in this diff
S2 airgap-post-install.sh fixes (tracking-id ownership, fail-fasts, catalog derivation, placeholder unification) ⏳ next
S3 shared mirror-rewrite image template ⏳
S4 render-gate hardening + CI ⏳
S5 mirror content (kyverno hook/test images) ⏳
S6–S7 comment sweep + docs ⏳
R review gate (Luna + adversarial + automated panel) — blocks testing ⏳
V1 connected run · V2 disconnected run · V3 regression paths (node-02) ⏳

Per-file connected-mode impact (S1)

File Change Connected impact
values-baremetal.yaml — reference, untouched
values-baremetal-hub.yaml bridge · acm→15 · mce conditional none (renders redhat-operators); stale comment block removed
values-azure.yaml bridge · wave-5 hook · full layout · mce conditional none beyond ordering metadata + the hook (waits, never fails)
values-azure-spoke.yaml bridge · layout none
values-trusted-hub.yaml bridge · wave-5 hook · layout · mce conditional none beyond ordering metadata + the hook
values-baremetal-spoke.yaml bridge · conditional overlay fixes an existing connected break (6 cs-* refs → 0)

Verification so far: helm template of all six cluster groups with clustergroup 0.9.58, diffed against goldens captured at 7efafc8 — only the additions above; no unexpected removals; spoke cs-* count 6 → 0.

Accepted risk (stated up front)

The azure / azure-spoke / trusted-hub layouts are not live-validated this round (Azure testing deliberately out of scope). Acceptance rests on: 1:1 copy of the twice-validated baremetal layout, render-gate ordering assertions for all groups, the bridge/hook mechanism being proven live in V1 on baremetal, and per-file rollback.

main.gitops.applicationHealthCheckEnabled is set globally in
values-global.yaml, so app-of-apps wave gating is now ON for every
cluster group — but the two escape hatches that make a gated first
sync work existed only in values-baremetal.yaml:

- the wave -1 ClusterRoleBinding bridge (patterns-operator#887):
  ArgoCD applies wave-0 resources by kind, so the imperative
  ServiceAccounts are attempted before the chart's own cluster-admin
  binding; ungated installs self-heal on the next auto-sync, gated
  ones park on wave-0 health and deadlock.
- the wave 15 acm application: the ACM chart renders the
  MultiClusterHub whose CRD is registered by the ACM operator — a
  wave-10 subscription. At wave 0 the acm app fails ArgoCD discovery
  on the not-yet-served operator.open-cluster-management.io/v1 and
  gates wave 10 behind itself: a hard deadlock.

Give every cluster group the same shape as the live-validated
values-baremetal.yaml layout (bridge at -1, vault/secrets/kyverno at
0, wait-for-vault-unsealed hook at 5, operator subscriptions at 10,
acm at 15, trustee/policies at 20, workloads at 30):

- values-baremetal-hub.yaml: bridge; acm -> wave 15; the
  acm.mce_operator.source tpl-conditional (mirrored catalog in
  airgap, redhat-operators otherwise); stale commented-out override
  block removed.
- values-azure.yaml, values-trusted-hub.yaml: bridge + wave-5
  wait-for-vault-unsealed hook (both run vault + ESO in-cluster) +
  full wave layout + the mce conditional.
- values-azure-spoke.yaml: bridge + wave layout (no vault, no ACM).
- values-baremetal-spoke.yaml: bridge; the airgap overlay becomes
  conditional like every other baremetal file — a CONNECTED spoke was
  previously pointed at cs-redhat-operator-index-v4-22, a mirrored
  catalog that does not exist outside airgap, leaving its sourceless
  subscriptions unresolvable.

Connected renders verified unchanged apart from the additions above:
full helm render of all six cluster groups diffed against a golden
baseline captured at 7efafc8 (clustergroup chart 0.9.58). The spoke's
connected render moves from 6 cs-* catalog references to 0.
@butler54 butler54 changed the title DRAFT fix: gating-safe waves for every cluster group + airgap hardening (review PR for #165) fix: gating-safe waves for every cluster group (review PR for #165, part 1) Nov 19, 2026
@butler54
butler54 merged commit 3aba6e1 into feat/t1-airgap-hardening Nov 19, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant