fix: comment out airgap-only secrets by default in values-secret template - #136
Merged
butler54 merged 1 commit intoAug 31, 2026
Conversation
…l/azure refvals
values-secret.yaml.template unconditionally enabled airgap-only secrets
(registryCaCert, bootstrap_secrets/mirror-registry-helm-oci), so connected
deployments (Azure, connected bare metal) hit 'make load-secrets' failures
for local files that only exist on disconnected-mirror deployments
(mirror-registry-ca-cert.pem, mirror-registry-password).
- Comment out registryCaCert and bootstrap_secrets by default, wrapped in
AIRGAP-MIRROR-SECRETS markers.
- Add scripts/enable-airgap-secrets.sh + 'make enable-airgap-secrets' to
uncomment both blocks together for airgap deployments; wired into
airgap/DEPLOY-RUNBOOK.md D-3.
- Also comment out tdxCollateral by default for consistency: it was labeled
'# Optional' but active unconditionally, same class of bug.
- pcrStash (Azure) and firmwareReferenceValues (bare metal) remain active by
default so the same values-secret file works on either topology without
editing. To keep 'make load-secrets' from failing on whichever platform's
file is missing, gen-secrets.sh now pre-touches both
~/.coco-pattern/measurements.json and firmware-reference-values.json with
an empty '{}' placeholder, and collect-firmware-refvals.sh also touches
the sibling platform's file after a real collection run. Real collected
data always overwrites the placeholder.
- Update README.md and docs/firmware-reference-values.md, which had stale
instructions to manually uncomment firmwareReferenceValues.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
values-secret.yaml.templateunconditionally enables airgap-only secrets(
registryCaCert,bootstrap_secrets/mirror-registry-helm-oci), soconnected deployments (Azure, connected bare metal) hit
make load-secretsfailures because the referenced local files
(
~/.coco-pattern/mirror-registry-ca-cert.pem,~/.coco-pattern/mirror-registry-password) only exist for disconnected-mirrordeployments.
Separately,
pcrStash(Azure) andfirmwareReferenceValues(bare metal) areboth enabled unconditionally so the same template works on either topology,
but nothing ensured the unused platform's local reference-value file
existed — so
make load-secretscould fail on whichever platform you aren'tactively deploying to (this exact issue was previously worked around
manually with an empty
{}placeholder during earlier testing).Changes
registryCaCertandbootstrap_secretsinvalues-secret.yaml.templateby default, wrapped inAIRGAP-MIRROR-SECRETS-START/-ENDmarkers.scripts/enable-airgap-secrets.sh+make enable-airgap-secretstouncomment both blocks together for airgap deployments in one step; wired
into
airgap/DEPLOY-RUNBOOK.mdstep D-3 so the automated runbook keepsworking unattended.
tdxCollateralby default for consistency — it waslabeled
# Optionalin its section header but was active unconditionally,the same class of bug (bare-metal-TDX-only, would fail on Azure / AMD
SEV-SNP bare metal).
pcrStashandfirmwareReferenceValuesactive by default (noper-topology template editing required). To prevent
make load-secretsfrom failing on whichever platform's file is missing:
gen-secrets.shnow pre-touches both~/.coco-pattern/measurements.jsonand
~/.coco-pattern/firmware-reference-values.jsonwith an empty{}placeholder if they don't already exist.
collect-firmware-refvals.shalso touches the sibling platform's fileafter a real collection run, in case
gen-secrets.shwasn't re-run.clobbered.
README.mdanddocs/firmware-reference-values.md, which hadstale instructions to manually uncomment
firmwareReferenceValues(it wasnever actually commented in the template).
Verification
bash -non all touched shell scripts.gen-secrets.shend-to-end (stubbedjose): confirmedboth refval placeholders are created and the printed instructions match
the new defaults.
values-secret.yaml.templateparses as valid YAML in both itsdefault (commented) state and after running
enable-airgap-secrets.sh(confirmed
registryCaCert+bootstrap_secretsappear correctly, andthe script is idempotent on repeated runs).
make helppicks up the newenable-airgap-secretstarget correctly.