Skip to content

Commit 1fa76b7

Browse files
butler54claude
andcommitted
fix: update RHDP wrappers to use unified reference value collection
Replace get-pcr.sh call with collect-firmware-refvals.sh --platform azure in wrapper.sh. Add missing reference value collection step to wrapper-multicluster.sh (was never collecting PCR values for Vault). Update RHDP README with prerequisites, env vars, and all deployment modes. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent da87a3b commit 1fa76b7

3 files changed

Lines changed: 44 additions & 8 deletions

File tree

rhdp/README.md

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
Red Hat demo platform is a system for employees and red hat partners to generate test infrastructure.
44
The scripts in this directory help users of that platform automate deployments.
55

6+
## Prerequisites
7+
8+
- `podman` installed and running (used for reference value collection)
9+
- `yq`, `jq` installed
10+
- OpenShift pull secret at `~/pull-secret.json`
11+
- SSH key at `~/.ssh/id_rsa` (RSA)
12+
- RHDP environment variables loaded (see below)
13+
14+
## Environment variables
15+
16+
Provided by your RHDP Azure Open Environment:
17+
18+
```shell
19+
export GUID=
20+
export CLIENT_ID=
21+
export PASSWORD=
22+
export TENANT=
23+
export SUBSCRIPTION=
24+
export RESOURCEGROUP=
25+
```
26+
627
## To deploy
728

829
1. Stand up the 'Azure Subscription Based Blank Open Environment'
@@ -12,13 +33,23 @@ The scripts in this directory help users of that platform automate deployments.
1233

1334
### Single Cluster Deployment
1435

15-
1. `bash ./rhdp/wrapper.sh eastasia`
16-
2. The wrapper script **requires** an azure region code this code SHOULD be the same as what was selected in RHDP.
36+
1. Set `main.clusterGroupName: simple` in `values-global.yaml`
37+
2. `bash ./rhdp/wrapper.sh eastasia`
38+
3. The wrapper script **requires** an azure region code. This code SHOULD be the same as what was selected in RHDP.
39+
4. Optionally use `--prefix` for custom cluster naming: `bash ./rhdp/wrapper.sh --prefix dev1 eastasia`
40+
41+
The wrapper handles: cluster provisioning, secret generation, PCR reference value collection (via veritas), and pattern installation.
1742

1843
### Multi-Cluster Deployment (Hub and Spoke)
1944

20-
1. `bash ./rhdp/wrapper-multicluster.sh eastasia`
21-
2. This creates two clusters: `coco-hub` and `coco-spoke` in the same region
22-
3. The pattern is deployed only on the hub cluster
23-
4. Hub cluster kubeconfig: `./openshift-install-hub/auth/kubeconfig`
24-
5. Spoke cluster kubeconfig: `./openshift-install-spoke/auth/kubeconfig`
45+
1. Set `main.clusterGroupName: trusted-hub` in `values-global.yaml`
46+
2. `bash ./rhdp/wrapper-multicluster.sh eastasia`
47+
3. This creates two clusters: `coco-hub` and `coco-spoke` in the same region
48+
4. The pattern is deployed on the hub cluster; the spoke is imported into ACM
49+
5. Hub cluster kubeconfig: `./openshift-install-hub/auth/kubeconfig`
50+
6. Spoke cluster kubeconfig: `./openshift-install-spoke/auth/kubeconfig`
51+
52+
### Cluster Only (no pattern install)
53+
54+
1. `bash ./rhdp/wrapper-cluster-only.sh eastasia`
55+
2. Provisions the cluster without installing secrets or the pattern

rhdp/wrapper-multicluster.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,11 @@ echo "---------------------"
144144
echo "setting up secrets"
145145
bash ./scripts/gen-secrets.sh
146146

147+
echo "---------------------"
148+
echo "retrieving PCR measurements"
149+
echo "---------------------"
150+
bash ./scripts/collect-firmware-refvals.sh --platform azure
151+
147152
echo "---------------------"
148153
echo "starting pattern install on hub cluster"
149154
echo "---------------------"

rhdp/wrapper.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ bash ./scripts/gen-secrets.sh
189189
echo "---------------------"
190190
echo "retrieving PCR measurements"
191191
echo "---------------------"
192-
bash ./scripts/get-pcr.sh
192+
bash ./scripts/collect-firmware-refvals.sh --platform azure
193193

194194
sleep 60
195195
echo "---------------------"

0 commit comments

Comments
 (0)