Skip to content

Commit ca59e9a

Browse files
Update Konflux references
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
1 parent a9a3243 commit ca59e9a

File tree

2 files changed

+88
-52
lines changed

2 files changed

+88
-52
lines changed

.tekton/quay-builder-qemu-v3-15-pull-request.yaml

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ spec:
3939
- name: build-source-image
4040
value: "true"
4141
- name: prefetch-input
42-
value: |
42+
value: |
4343
[
4444
{"type":"generic", "path": "."},
4545
{"type":"rpm", "path": "."}
@@ -128,6 +128,10 @@ spec:
128128
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
129129
name: build-platforms
130130
type: array
131+
- name: buildah-format
132+
default: docker
133+
type: string
134+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
131135
results:
132136
- description: ""
133137
name: IMAGE_URL
@@ -155,7 +159,7 @@ spec:
155159
- name: name
156160
value: init
157161
- name: bundle
158-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
162+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
159163
- name: kind
160164
value: task
161165
resolver: bundles
@@ -176,7 +180,7 @@ spec:
176180
- name: name
177181
value: git-clone-oci-ta
178182
- name: bundle
179-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:efcce59f226b1426f7685917e41a50b73478f38fe9ac56c98f1e961effd4b6f0
183+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
180184
- name: kind
181185
value: task
182186
resolver: bundles
@@ -207,7 +211,7 @@ spec:
207211
- name: name
208212
value: prefetch-dependencies-oci-ta
209213
- name: bundle
210-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
214+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
211215
- name: kind
212216
value: task
213217
resolver: bundles
@@ -252,27 +256,29 @@ spec:
252256
value: "true"
253257
- name: LABELS
254258
value:
255-
- com.redhat.component="quay-builder-qemu-rhcos-container"
256-
- name="quay/quay-builder-qemu-rhcos-rhel8"
257-
- version=3.15
258-
- io.k8s.display-name="Red Hat Quay - Builder QEMU RHCOS"
259-
- io.k8s.description="Red Hat Quay - Builder QEMU RHCOS"
260-
- io.openshift.tags="quay"
261-
- summary="Red Hat Quay - Builder QEMU RHCOS"
262-
- maintainer="[email protected]"
263-
- distribution-scope="restricted"
264-
- description="Red Hat Quay - Builder QEMU RHCOS"
265-
- tags="quay"
266-
- url="https://docs.redhat.com/en/documentation/red_hat_quay/3.15"
267-
- vendor=Red Hat, Inc.
259+
- com.redhat.component="quay-builder-qemu-rhcos-container"
260+
- name="quay/quay-builder-qemu-rhcos-rhel8"
261+
- version=3.15
262+
- io.k8s.display-name="Red Hat Quay - Builder QEMU RHCOS"
263+
- io.k8s.description="Red Hat Quay - Builder QEMU RHCOS"
264+
- io.openshift.tags="quay"
265+
- summary="Red Hat Quay - Builder QEMU RHCOS"
266+
- maintainer="[email protected]"
267+
- distribution-scope="restricted"
268+
- description="Red Hat Quay - Builder QEMU RHCOS"
269+
- tags="quay"
270+
- url="https://docs.redhat.com/en/documentation/red_hat_quay/3.15"
271+
- vendor=Red Hat, Inc.
272+
- name: BUILDAH_FORMAT
273+
value: $(params.buildah-format)
268274
runAfter:
269275
- prefetch-dependencies
270276
taskRef:
271277
params:
272278
- name: name
273279
value: buildah-remote-oci-ta
274280
- name: bundle
275-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:e149741bff59350e110699d9933c5ac8fdb4a9fcacab524e0b12c6653463c938
281+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
276282
- name: kind
277283
value: task
278284
resolver: bundles
@@ -294,14 +300,16 @@ spec:
294300
- name: IMAGES
295301
value:
296302
- $(tasks.build-images.results.IMAGE_REF[*])
303+
- name: BUILDAH_FORMAT
304+
value: $(params.buildah-format)
297305
runAfter:
298306
- build-images
299307
taskRef:
300308
params:
301309
- name: name
302310
value: build-image-index
303311
- name: bundle
304-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:ba7fbed5c4862968c1a77d6b90d5bdd497925ab1de41b859c027dd5c3069cd3e
312+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
305313
- name: kind
306314
value: task
307315
resolver: bundles
@@ -327,7 +335,7 @@ spec:
327335
- name: name
328336
value: source-build-oci-ta
329337
- name: bundle
330-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:21d33596cf7ff61cab38b68caf578e55509748962bf6f4030bf1dfb8cd68a257
338+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
331339
- name: kind
332340
value: task
333341
resolver: bundles
@@ -353,7 +361,7 @@ spec:
353361
- name: name
354362
value: deprecated-image-check
355363
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
364+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
357365
- name: kind
358366
value: task
359367
resolver: bundles
@@ -362,7 +370,12 @@ spec:
362370
operator: in
363371
values:
364372
- "false"
365-
- name: clair-scan
373+
- matrix:
374+
params:
375+
- name: image-platform
376+
value:
377+
- $(params.build-platforms)
378+
name: clair-scan
366379
params:
367380
- name: image-digest
368381
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -375,7 +388,7 @@ spec:
375388
- name: name
376389
value: clair-scan
377390
- name: bundle
378-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
391+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
379392
- name: kind
380393
value: task
381394
resolver: bundles
@@ -421,7 +434,7 @@ spec:
421434
- name: name
422435
value: sast-snyk-check-oci-ta
423436
- name: bundle
424-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
437+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
425438
- name: kind
426439
value: task
427440
resolver: bundles
@@ -443,7 +456,7 @@ spec:
443456
- name: name
444457
value: clamav-scan
445458
- name: bundle
446-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:40555593de346dd3083410c9517d52c3f27e27cb66f447054f4f66fcff56e23f
459+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
447460
- name: kind
448461
value: task
449462
resolver: bundles
@@ -452,6 +465,11 @@ spec:
452465
operator: in
453466
values:
454467
- "false"
468+
matrix:
469+
params:
470+
- name: image-arch
471+
value:
472+
- $(params.build-platforms)
455473
- name: sast-coverity-check
456474
params:
457475
- name: image-digest
@@ -606,7 +624,7 @@ spec:
606624
- name: name
607625
value: push-dockerfile-oci-ta
608626
- name: bundle
609-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:06529ba66b37bdc1f55590359aa849bc570b4e9c110c983e27f07081dc09a12b
627+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
610628
- name: kind
611629
value: task
612630
resolver: bundles

.tekton/quay-builder-qemu-v3-15-push.yaml

Lines changed: 44 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
- name: build-source-image
3737
value: "true"
3838
- name: prefetch-input
39-
value: |
39+
value: |
4040
[
4141
{"type":"generic", "path": "."},
4242
{"type":"rpm", "path": "."}
@@ -125,6 +125,10 @@ spec:
125125
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
126126
name: build-platforms
127127
type: array
128+
- name: buildah-format
129+
default: docker
130+
type: string
131+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
128132
results:
129133
- description: ""
130134
name: IMAGE_URL
@@ -152,7 +156,7 @@ spec:
152156
- name: name
153157
value: init
154158
- name: bundle
155-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
159+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
156160
- name: kind
157161
value: task
158162
resolver: bundles
@@ -173,7 +177,7 @@ spec:
173177
- name: name
174178
value: git-clone-oci-ta
175179
- name: bundle
176-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:efcce59f226b1426f7685917e41a50b73478f38fe9ac56c98f1e961effd4b6f0
180+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
177181
- name: kind
178182
value: task
179183
resolver: bundles
@@ -204,7 +208,7 @@ spec:
204208
- name: name
205209
value: prefetch-dependencies-oci-ta
206210
- name: bundle
207-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
211+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
208212
- name: kind
209213
value: task
210214
resolver: bundles
@@ -249,27 +253,29 @@ spec:
249253
value: "true"
250254
- name: LABELS
251255
value:
252-
- com.redhat.component="quay-builder-qemu-rhcos-container"
253-
- name="quay/quay-builder-qemu-rhcos-rhel8"
254-
- version=3.15.3
255-
- io.k8s.display-name="Red Hat Quay - Builder QEMU RHCOS"
256-
- io.k8s.description="Red Hat Quay - Builder QEMU RHCOS"
257-
- io.openshift.tags="quay"
258-
- summary="Red Hat Quay - Builder QEMU RHCOS"
259-
- maintainer="[email protected]"
260-
- distribution-scope="restricted"
261-
- description="Red Hat Quay - Builder QEMU RHCOS"
262-
- tags="quay"
263-
- url="https://docs.redhat.com/en/documentation/red_hat_quay/3.15"
264-
- vendor=Red Hat, Inc.
256+
- com.redhat.component="quay-builder-qemu-rhcos-container"
257+
- name="quay/quay-builder-qemu-rhcos-rhel8"
258+
- version=3.15.3
259+
- io.k8s.display-name="Red Hat Quay - Builder QEMU RHCOS"
260+
- io.k8s.description="Red Hat Quay - Builder QEMU RHCOS"
261+
- io.openshift.tags="quay"
262+
- summary="Red Hat Quay - Builder QEMU RHCOS"
263+
- maintainer="[email protected]"
264+
- distribution-scope="restricted"
265+
- description="Red Hat Quay - Builder QEMU RHCOS"
266+
- tags="quay"
267+
- url="https://docs.redhat.com/en/documentation/red_hat_quay/3.15"
268+
- vendor=Red Hat, Inc.
269+
- name: BUILDAH_FORMAT
270+
value: $(params.buildah-format)
265271
runAfter:
266272
- prefetch-dependencies
267273
taskRef:
268274
params:
269275
- name: name
270276
value: buildah-remote-oci-ta
271277
- name: bundle
272-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:e149741bff59350e110699d9933c5ac8fdb4a9fcacab524e0b12c6653463c938
278+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
273279
- name: kind
274280
value: task
275281
resolver: bundles
@@ -291,14 +297,16 @@ spec:
291297
- name: IMAGES
292298
value:
293299
- $(tasks.build-images.results.IMAGE_REF[*])
300+
- name: BUILDAH_FORMAT
301+
value: $(params.buildah-format)
294302
runAfter:
295303
- build-images
296304
taskRef:
297305
params:
298306
- name: name
299307
value: build-image-index
300308
- name: bundle
301-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:ba7fbed5c4862968c1a77d6b90d5bdd497925ab1de41b859c027dd5c3069cd3e
309+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
302310
- name: kind
303311
value: task
304312
resolver: bundles
@@ -324,7 +332,7 @@ spec:
324332
- name: name
325333
value: source-build-oci-ta
326334
- name: bundle
327-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:21d33596cf7ff61cab38b68caf578e55509748962bf6f4030bf1dfb8cd68a257
335+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
328336
- name: kind
329337
value: task
330338
resolver: bundles
@@ -350,7 +358,7 @@ spec:
350358
- name: name
351359
value: deprecated-image-check
352360
- name: bundle
353-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
361+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
354362
- name: kind
355363
value: task
356364
resolver: bundles
@@ -359,7 +367,12 @@ spec:
359367
operator: in
360368
values:
361369
- "false"
362-
- name: clair-scan
370+
- matrix:
371+
params:
372+
- name: image-platform
373+
value:
374+
- $(params.build-platforms)
375+
name: clair-scan
363376
params:
364377
- name: image-digest
365378
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -372,7 +385,7 @@ spec:
372385
- name: name
373386
value: clair-scan
374387
- name: bundle
375-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
388+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
376389
- name: kind
377390
value: task
378391
resolver: bundles
@@ -418,7 +431,7 @@ spec:
418431
- name: name
419432
value: sast-snyk-check-oci-ta
420433
- name: bundle
421-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
434+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
422435
- name: kind
423436
value: task
424437
resolver: bundles
@@ -440,7 +453,7 @@ spec:
440453
- name: name
441454
value: clamav-scan
442455
- name: bundle
443-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:40555593de346dd3083410c9517d52c3f27e27cb66f447054f4f66fcff56e23f
456+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
444457
- name: kind
445458
value: task
446459
resolver: bundles
@@ -449,6 +462,11 @@ spec:
449462
operator: in
450463
values:
451464
- "false"
465+
matrix:
466+
params:
467+
- name: image-arch
468+
value:
469+
- $(params.build-platforms)
452470
- name: sast-coverity-check
453471
params:
454472
- name: image-digest
@@ -603,7 +621,7 @@ spec:
603621
- name: name
604622
value: push-dockerfile-oci-ta
605623
- name: bundle
606-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:06529ba66b37bdc1f55590359aa849bc570b4e9c110c983e27f07081dc09a12b
624+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
607625
- name: kind
608626
value: task
609627
resolver: bundles

0 commit comments

Comments
 (0)