Skip to content

Commit c59664e

Browse files
simonbairdsimonbaird
authored
Merge pull request #2607 from simonbaird/use-newer-image-refs
Use Konflux built image refs for tekton task & cli image
2 parents 5f4c192 + d3a7bd4 commit c59664e

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

‎.tekton/cli-main-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- name: output-image
2626
value: quay.io/redhat-user-workloads/rhtap-contract-tenant/ec-main/cli-main:{{revision}}
2727
- name: bundle-cli-ref-repo
28-
value: quay.io/enterprise-contract/cli
28+
value: quay.io/conforma/cli
2929
- name: dockerfile
3030
value: Dockerfile.dist
3131
- name: image-expires-after

‎release/cli.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ spec:
114114
taskRef:
115115
params:
116116
- name: bundle
117-
value: quay.io/enterprise-contract/ec-task-bundle:snapshot
117+
value: quay.io/conforma/tekton-task:latest
118118
- name: kind
119119
value: task
120120
- name: name
@@ -139,7 +139,7 @@ spec:
139139
taskRef:
140140
params:
141141
- name: bundle
142-
value: quay.io/enterprise-contract/ec-task-bundle:snapshot
142+
value: quay.io/conforma/tekton-task:latest
143143
- name: kind
144144
value: task
145145
- name: name

‎release/setup.yaml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,12 @@ metadata:
2222
name: tenant-release
2323
namespace: rhtap-contract-tenant
2424
secrets:
25-
- name: ec-cli-main # push quay.io/enterprise-contract/cli
26-
- name: ec-tekton-task-main # push quay.io/enterprise-contract/tekton-task
25+
# Push credential for quay.io/conforma/cli
26+
# and quay.io/enterprise-contract/cli
27+
- name: ec-cli-main
28+
# Push credential for quay.io/conforma/tekton-task
29+
# and quay.io/enterprise-contract/tekton-task
30+
- name: ec-tekton-task-main
2731
---
2832
apiVersion: rbac.authorization.k8s.io/v1
2933
kind: Role

‎tasks/verify-conforma-konflux-ta/0.1/verify-conforma-konflux-ta.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ spec:
201201
image: quay.io/redhat-appstudio/build-trusted-artifacts:e02102ede09aa07187cba066ad547a54724e5cf4
202202

203203
- name: initialize-tuf
204-
image: quay.io/conforma/cli:snapshot
204+
image: quay.io/conforma/cli:latest
205205
script: |-
206206
set -euo pipefail
207207
@@ -229,12 +229,12 @@ spec:
229229
value: $(params.SINGLE_COMPONENT_CUSTOM_RESOURCE_NS)
230230
- name: SNAPSHOT_PATH
231231
value: $(params.HOMEDIR)/snapshot.json
232-
image: quay.io/conforma/cli:snapshot
232+
image: quay.io/conforma/cli:latest
233233
onError: continue # progress even if the step fails so we can see the debug logs
234234
command: [reduce-snapshot.sh]
235235

236236
- name: validate
237-
image: quay.io/conforma/cli:snapshot
237+
image: quay.io/conforma/cli:latest
238238
onError: continue # progress even if the step fails so we can see the debug logs
239239
command: [ec]
240240
args:
@@ -297,7 +297,7 @@ spec:
297297
readOnly: true
298298

299299
- name: report-json
300-
image: quay.io/conforma/cli:snapshot
300+
image: quay.io/conforma/cli:latest
301301
onError: continue # progress even if the step fails so we can see the debug logs
302302
command: [sh, -c]
303303
args:
@@ -310,34 +310,34 @@ spec:
310310
- "jq . $(params.HOMEDIR)/report-json.json | awk '{gsub(/^ +/, \"\"); acc += length; if (acc >= 8000) { printf \"\\n\"; acc=length } printf $0 }'"
311311

312312
- name: summary
313-
image: quay.io/conforma/cli:snapshot
313+
image: quay.io/conforma/cli:latest
314314
onError: continue # progress even if the step fails so we can see the debug logs
315315
command: [jq]
316316
args:
317317
- "."
318318
- "$(results.TEST_OUTPUT.path)"
319319

320320
- name: info
321-
image: quay.io/conforma/cli:snapshot
321+
image: quay.io/conforma/cli:latest
322322
command: [printf]
323323
args:
324324
- "----- DEBUG OUTPUT -----\n"
325325

326326
- name: version
327-
image: quay.io/conforma/cli:snapshot
327+
image: quay.io/conforma/cli:latest
328328
command: [ec]
329329
args:
330330
- version
331331

332332
- name: show-config
333-
image: quay.io/conforma/cli:snapshot
333+
image: quay.io/conforma/cli:latest
334334
command: [jq]
335335
args:
336336
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
337337
- "$(params.HOMEDIR)/report-json.json"
338338

339339
- name: assert
340-
image: quay.io/conforma/cli:snapshot
340+
image: quay.io/conforma/cli:latest
341341
command: [jq]
342342
args:
343343
- "--argjson"

‎tasks/verify-enterprise-contract/0.1/verify-enterprise-contract.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ spec:
179179
memory: 256Mi
180180
limits:
181181
memory: 256Mi
182-
image: quay.io/conforma/cli:snapshot
182+
image: quay.io/conforma/cli:latest
183183
command: [ec]
184184
args:
185185
- sigstore
@@ -211,12 +211,12 @@ spec:
211211
value: $(params.SINGLE_COMPONENT_CUSTOM_RESOURCE_NS)
212212
- name: SNAPSHOT_PATH
213213
value: $(params.HOMEDIR)/snapshot.json
214-
image: quay.io/conforma/cli:snapshot
214+
image: quay.io/conforma/cli:latest
215215
onError: continue # progress even if the step fails so we can see the debug logs
216216
command: [reduce-snapshot.sh]
217217

218218
- name: validate
219-
image: quay.io/conforma/cli:snapshot
219+
image: quay.io/conforma/cli:latest
220220
onError: continue # progress even if the step fails so we can see the debug logs
221221
command: [ec]
222222
args:
@@ -284,7 +284,7 @@ spec:
284284
memory: 256Mi
285285
limits:
286286
memory: 256Mi
287-
image: quay.io/conforma/cli:snapshot
287+
image: quay.io/conforma/cli:latest
288288
onError: continue # progress even if the step fails so we can see the debug logs
289289
command: [sh, -c]
290290
args:
@@ -303,7 +303,7 @@ spec:
303303
memory: 256Mi
304304
limits:
305305
memory: 256Mi
306-
image: quay.io/conforma/cli:snapshot
306+
image: quay.io/conforma/cli:latest
307307
onError: continue # progress even if the step fails so we can see the debug logs
308308
command: [jq]
309309
args:
@@ -317,7 +317,7 @@ spec:
317317
memory: 256Mi
318318
limits:
319319
memory: 256Mi
320-
image: quay.io/conforma/cli:snapshot
320+
image: quay.io/conforma/cli:latest
321321
command: [printf]
322322
args:
323323
- "----- DEBUG OUTPUT -----\n"
@@ -329,7 +329,7 @@ spec:
329329
memory: 256Mi
330330
limits:
331331
memory: 256Mi
332-
image: quay.io/conforma/cli:snapshot
332+
image: quay.io/conforma/cli:latest
333333
command: [ec]
334334
args:
335335
- version
@@ -341,7 +341,7 @@ spec:
341341
memory: 256Mi
342342
limits:
343343
memory: 256Mi
344-
image: quay.io/conforma/cli:snapshot
344+
image: quay.io/conforma/cli:latest
345345
command: [jq]
346346
args:
347347
- '{policy: .policy, key: .key, "effective-time": .["effective-time"]}'
@@ -354,7 +354,7 @@ spec:
354354
memory: 256Mi
355355
limits:
356356
memory: 256Mi
357-
image: quay.io/conforma/cli:snapshot
357+
image: quay.io/conforma/cli:latest
358358
command: [jq]
359359
args:
360360
- "--argjson"

0 commit comments

Comments
 (0)