fix: run 'make cache-keys' in RHDP wrapper scripts - #146
Open
butler54 wants to merge 1 commit into
Open
Conversation
values-secret.yaml.template's sigstore-keys secret unconditionally references ~/.coco-pattern/SIGSTORE-redhat-release3 (fetched by the 'make cache-keys' target), but neither rhdp/wrapper.sh nor rhdp/wrapper-multicluster.sh ever called that target -- they only ran gen-secrets.sh (KBS/JWK keys + refval placeholders) and collect_firmware_refvals.py (PCR measurements) before invoking 'pattern.sh make install', which loads values-secret-coco-pattern.yaml. Observed on a bare/fresh Azure install via rhdp/wrapper.sh: ~/.coco-pattern/SIGSTORE-redhat-release3 was never created. Add 'make cache-keys' to both wrapper scripts, after gen-secrets.sh and before the PCR measurement collection step, matching the order the Makefile's own README/gen-secrets.sh guidance describes for a manual deployment. rhdp/wrapper-cluster-only.sh is unaffected -- it only provisions the cluster (openshift-install) and never runs gen-secrets.sh or pattern.sh make install. Audited every active (uncommented) 'path:' reference in values-secret.yaml.template against what the wrapper scripts now generate for a connected Azure deployment -- all four (sealed-secrets-signing-pub.jwk, SIGSTORE-redhat-release3, measurements.json, firmware-reference-values.json) are now covered.
butler54
force-pushed
the
fix/rhdp-wrapper-cache-keys
branch
from
September 3, 2026 19:18
684938a to
d1cdd36
Compare
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
On a bare/fresh Azure install via
rhdp/wrapper.sh,~/.coco-pattern/SIGSTORE-redhat-release3was never generated.values-secret.yaml.template'ssigstore-keyssecret unconditionallyreferences that path:
It's fetched by the
make cache-keysMakefile target — but neitherrhdp/wrapper.shnorrhdp/wrapper-multicluster.shever called thattarget. They only ran
gen-secrets.sh(KBS/JWK keys + refval placeholders)and
collect_firmware_refvals.py(PCR measurements) before invoking./pattern.sh make install, which is what actually loadsvalues-secret-coco-pattern.yamlinto Vault.Fix
Add
make cache-keysto both wrapper scripts, right aftergen-secrets.shand before the PCR measurement collection step.
rhdp/wrapper-cluster-only.shis unaffected — it only provisions thecluster (
openshift-install) and never runsgen-secrets.shorpattern.sh make install.Verification
Audited every active (uncommented)
path:reference invalues-secret.yaml.templateagainst what the wrapper scripts generate fora connected Azure deployment:
sealedSecretsSigningKey.publicsealed-secrets-signing-pub.jwkgen-secrets.sh(jose)sigstore-keys.redhat-release3SIGSTORE-redhat-release3make cache-keys(this PR)pcrStash.jsonmeasurements.jsoncollect_firmware_refvals.py --platform azurefirmwareReferenceValues.jsonfirmware-reference-values.jsonAll four are now covered by the wrapper scripts' generation steps.