Skip to content

Commit 846d4b8

Browse files
committed
Update supply-chain.patch
Signed-off-by: Manuel Lorenzo <mlorenzofr@redhat.com>
1 parent 2a81a3d commit 846d4b8

1 file changed

Lines changed: 22 additions & 12 deletions

File tree

docs/values-patches/supply-chain.patch

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/values-hub.yaml b/values-hub.yaml
2-
index 65b3645..05d25ea 100644
2+
index b8da45d..e13d31b 100644
33
--- a/values-hub.yaml
44
+++ b/values-hub.yaml
55
@@ -28,34 +28,34 @@ clusterGroup:
@@ -149,20 +149,31 @@ index 65b3645..05d25ea 100644
149149
projects:
150150
- hub
151151
# Explicitly mention the cluster-state based overrides we plan to use for this pattern.
152-
@@ -212,103 +212,104 @@ clusterGroup:
152+
@@ -301,109 +301,109 @@ clusterGroup:
153153
policies:
154-
- global-secret
154+
- apps-qtodo-jwt-secret
155155
# RHTPA vault role
156156
- # - name: rhtpa
157157
- # audience: rhtpa
158158
- # subject: spiffe://apps.{{ $.Values.global.clusterDomain }}/ns/trusted-profile-analyzer/sa/rhtpa
159159
- # policies:
160-
- # - global-secret
160+
- # - hub-infra-rhtpa-jwt-secret
161161
+ - name: rhtpa
162162
+ audience: rhtpa
163163
+ subject: spiffe://apps.{{ $.Values.global.clusterDomain }}/ns/trusted-profile-analyzer/sa/rhtpa
164164
+ policies:
165-
+ - global-secret
165+
+ - hub-infra-rhtpa-jwt-secret
166+
# Supply chain vault role (for Tekton pipelines)
167+
- # - name: supply-chain
168+
- # audience: supply-chain
169+
- # subject: spiffe://apps.{{ $.Values.global.clusterDomain }}/ns/pipeline/sa/pipeline
170+
- # policies:
171+
- # - hub-supply-chain-jwt-secret
172+
+ - name: supply-chain
173+
+ audience: supply-chain
174+
+ subject: spiffe://apps.{{ $.Values.global.clusterDomain }}/ns/pipeline/sa/pipeline
175+
+ policies:
176+
+ - hub-supply-chain-jwt-secret
166177
# Shared Object Storage Backend
167178
# Required for RHTPA and QUAY (provides S3-compatible storage via NooBaa MCG)
168179
# NooBaa MCG provides S3-compatible object storage for multiple applications
@@ -338,13 +349,12 @@ index 65b3645..05d25ea 100644
338349
+ value: "false"
339350
+ - name: rhtpa.modules.createImporters.importers.redhat-sboms.sbom.disabled
340351
+ value: "false"
341-
+ # COMMENTED OUT - Uncomment to enable RHTPA
342352
golang-external-secrets:
343353
name: golang-external-secrets
344354
namespace: golang-external-secrets
345-
@@ -350,39 +351,39 @@ clusterGroup:
355+
@@ -450,39 +450,39 @@ clusterGroup:
346356
- name: app.vault.secretPath
347-
value: secret/data/global/qtodo
357+
value: secret/data/apps/qtodo/qtodo-db
348358
# For Secure Supply Chain, we changed the qtodo image to use the one built in the secure supply chain
349359
- # - name: app.images.main.name
350360
- # value: quay-registry-quay-quay-enterprise.apps.{{ $.Values.global.clusterDomain }}/ztvp/qtodo
@@ -364,9 +374,9 @@ index 65b3645..05d25ea 100644
364374
+ - name: app.images.main.registry.auth
365375
+ value: true
366376
+ - name: app.images.main.registry.user
367-
+ value: quay-admin
377+
+ value: quay-user
368378
+ - name: app.images.main.registry.passwordVaultKey
369-
+ value: quay-admin-password
379+
+ value: quay-user-password
370380
# Secure Supply Chain - Uncomment to enable
371381
- # supply-chain:
372382
- # name: supply-chain
@@ -407,9 +417,9 @@ index 65b3645..05d25ea 100644
407417
+ - name: registry.tlsVerify
408418
+ value: "false"
409419
+ - name: registry.user
410-
+ value: quay-admin
420+
+ value: quay-user
411421
+ - name: registry.passwordVaultKey
412-
+ value: quay-admin-password
422+
+ value: quay-user-password
413423
argoCD:
414424
resourceHealthChecks:
415425
- check: |

0 commit comments

Comments
 (0)