Skip to content

fix: run 'make cache-keys' in RHDP wrapper scripts - #146

Open
butler54 wants to merge 1 commit into
validatedpatterns:mainfrom
butler54:fix/rhdp-wrapper-cache-keys
Open

fix: run 'make cache-keys' in RHDP wrapper scripts#146
butler54 wants to merge 1 commit into
validatedpatterns:mainfrom
butler54:fix/rhdp-wrapper-cache-keys

Conversation

@butler54

@butler54 butler54 commented Sep 3, 2026

Copy link
Copy Markdown
Collaborator

Problem

On a bare/fresh Azure install via rhdp/wrapper.sh, ~/.coco-pattern/SIGSTORE-redhat-release3 was never generated.

values-secret.yaml.template's sigstore-keys secret unconditionally
references that path:

- name: sigstore-keys
  vaultPrefixes:
  - hub
  fields:
  - name: redhat-release3
    path: ~/.coco-pattern/SIGSTORE-redhat-release3

It's fetched by the make cache-keys Makefile 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 is what actually loads
values-secret-coco-pattern.yaml into Vault.

Fix

Add make cache-keys to both wrapper scripts, right after gen-secrets.sh
and before the PCR measurement collection step.

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.

Verification

Audited every active (uncommented) path: reference in
values-secret.yaml.template against what the wrapper scripts generate for
a connected Azure deployment:

Secret field Path Generated by
sealedSecretsSigningKey.public sealed-secrets-signing-pub.jwk gen-secrets.sh (jose)
sigstore-keys.redhat-release3 SIGSTORE-redhat-release3 make cache-keys (this PR)
pcrStash.json measurements.json collect_firmware_refvals.py --platform azure
firmwareReferenceValues.json firmware-reference-values.json sibling placeholder (auto-created)

All four are now covered by the wrapper scripts' generation steps.

@butler54
butler54 requested a review from a team September 3, 2026 19:16
@butler54 butler54 changed the title fix: RHDP wrapper scripts never ran 'make cache-keys' fix: run 'make cache-keys' in RHDP wrapper scripts Sep 3, 2026
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
butler54 force-pushed the fix/rhdp-wrapper-cache-keys branch from 684938a to d1cdd36 Compare September 3, 2026 19:18
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