Skip to content

Commit 8f9edc0

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

File tree

2 files changed

+82
-62
lines changed

2 files changed

+82
-62
lines changed

.tekton/rhobs-konflux-obsctl-reloader-pull-request.yaml

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ metadata:
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
11-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12-
== "main"
13-
creationTimestamp: null
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main"
12+
creationTimestamp:
1413
labels:
1514
appstudio.openshift.io/application: rhobs
1615
appstudio.openshift.io/component: rhobs-konflux-obsctl-reloader
@@ -30,7 +29,7 @@ spec:
3029
- name: dockerfile
3130
value: Containerfile.obsctl
3231
- name: build-source-image
33-
value: "true"
32+
value: "true"
3433
pipelineSpec:
3534
description: |
3635
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -47,7 +46,7 @@ spec:
4746
- name: name
4847
value: show-sbom
4948
- name: bundle
50-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:002f7c8c1d2f9e09904035da414aba1188ae091df0ea9532cd997be05e73d594
49+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
5150
- name: kind
5251
value: task
5352
resolver: bundles
@@ -63,13 +62,11 @@ spec:
6362
name: output-image
6463
type: string
6564
- default: .
66-
description: Path to the source code of an application's component from where
67-
to build image.
65+
description: Path to the source code of an application's component from where to build image.
6866
name: path-context
6967
type: string
7068
- default: Dockerfile
71-
description: Path to the Dockerfile inside the context specified by parameter
72-
path-context
69+
description: Path to the Dockerfile inside the context specified by parameter path-context
7370
name: dockerfile
7471
type: string
7572
- default: "false"
@@ -89,8 +86,7 @@ spec:
8986
name: prefetch-input
9087
type: string
9188
- default: ""
92-
description: Image tag expiration time, time values could be something like
93-
1h, 2d, 3w for hours, days, and weeks, respectively.
89+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9490
name: image-expires-after
9591
- default: "false"
9692
description: Build a source image.
@@ -108,6 +104,10 @@ spec:
108104
description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
109105
name: build-args-file
110106
type: string
107+
- name: buildah-format
108+
default: docker
109+
type: string
110+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
111111
results:
112112
- description: ""
113113
name: IMAGE_URL
@@ -135,7 +135,7 @@ spec:
135135
- name: name
136136
value: init
137137
- name: bundle
138-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:7a24924417260b7094541caaedd2853dc8da08d4bb0968f710a400d3e8062063
138+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
139139
- name: kind
140140
value: task
141141
resolver: bundles
@@ -156,7 +156,7 @@ spec:
156156
- name: name
157157
value: git-clone-oci-ta
158158
- name: bundle
159-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:8ecf57d5a6697ce709bee65b62781efe79a10b0c2b95e05576442b67fbd61744
159+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
160160
- name: kind
161161
value: task
162162
resolver: bundles
@@ -185,7 +185,7 @@ spec:
185185
- name: name
186186
value: prefetch-dependencies-oci-ta
187187
- name: bundle
188-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:3db5d3a02bcbbc034080474c06bec8388bd6abc71606503ac4832f6890e71503
188+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
189189
- name: kind
190190
value: task
191191
resolver: bundles
@@ -219,14 +219,16 @@ spec:
219219
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
220220
- name: CACHI2_ARTIFACT
221221
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
222+
- name: BUILDAH_FORMAT
223+
value: $(params.buildah-format)
222224
runAfter:
223225
- prefetch-dependencies
224226
taskRef:
225227
params:
226228
- name: name
227229
value: buildah-oci-ta
228230
- name: bundle
229-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:6ac9d16f598c14a4b56e662eccda0a438e94aa8f87dd27a3ea0ff1abc6e00c66
231+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:38d08ea58511a67f8754dc025feebdec8ae342fb4e25bc67a3726ec84f7cb7d1
230232
- name: kind
231233
value: task
232234
resolver: bundles
@@ -248,14 +250,16 @@ spec:
248250
- name: IMAGES
249251
value:
250252
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
253+
- name: BUILDAH_FORMAT
254+
value: $(params.buildah-format)
251255
runAfter:
252256
- build-container
253257
taskRef:
254258
params:
255259
- name: name
256260
value: build-image-index
257261
- name: bundle
258-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:1b357f2ed430d18a009740a1783dd15af70ce1e23dc6254da1a83e9ec595d5be
262+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
259263
- name: kind
260264
value: task
261265
resolver: bundles
@@ -267,19 +271,21 @@ spec:
267271
- name: build-source-image
268272
params:
269273
- name: BINARY_IMAGE
270-
value: $(params.output-image)
274+
value: $(tasks.build-image-index.results.IMAGE_URL)
271275
- name: SOURCE_ARTIFACT
272276
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
273277
- name: CACHI2_ARTIFACT
274278
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
279+
- name: BINARY_IMAGE_DIGEST
280+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
275281
runAfter:
276282
- build-image-index
277283
taskRef:
278284
params:
279285
- name: name
280286
value: source-build-oci-ta
281287
- name: bundle
282-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:56fa2cbfc04bad4765b7fe1fa8022587f4042d4e8533bb5f65311d46b43226ee
288+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
283289
- name: kind
284290
value: task
285291
resolver: bundles
@@ -305,7 +311,7 @@ spec:
305311
- name: name
306312
value: deprecated-image-check
307313
- name: bundle
308-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:ecd33669676b3a193ff4c2c6223cb912cc1b0cf5cc36e080eaec7718500272cf
314+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
309315
- name: kind
310316
value: task
311317
resolver: bundles
@@ -327,7 +333,7 @@ spec:
327333
- name: name
328334
value: clair-scan
329335
- name: bundle
330-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:878ae247ffc58d95a9ac68e4d658ef91ef039363e03e65a386bc0ead02d9d7d8
336+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
331337
- name: kind
332338
value: task
333339
resolver: bundles
@@ -347,7 +353,7 @@ spec:
347353
- name: name
348354
value: ecosystem-cert-preflight-checks
349355
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:302828e9d7abc72b8a44fb2b9be068f86c982d8e5f4550b8bf654571d6361ee8
356+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
351357
- name: kind
352358
value: task
353359
resolver: bundles
@@ -373,7 +379,7 @@ spec:
373379
- name: name
374380
value: sast-snyk-check-oci-ta
375381
- name: bundle
376-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:6078ec8ec7caacbb8203138fcaa63db24e88dbf838544340bb0752d5b69f20ae
382+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
377383
- name: kind
378384
value: task
379385
resolver: bundles
@@ -395,7 +401,7 @@ spec:
395401
- name: name
396402
value: clamav-scan
397403
- name: bundle
398-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:98d94290d6f21b6e231485326e3629bbcdec75c737b84e05ac9eac78f9a2c8b4
404+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
399405
- name: kind
400406
value: task
401407
resolver: bundles
@@ -432,15 +438,15 @@ spec:
432438
- name: CACHI2_ARTIFACT
433439
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
434440
- name: image-digest
435-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
441+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
436442
runAfter:
437443
- coverity-availability-check
438444
taskRef:
439445
params:
440446
- name: name
441447
value: sast-coverity-check-oci-ta
442448
- name: bundle
443-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:87af64576088ba68f2a5b89998b7ae9e92d7e4f039274e4be6000eff6ce0d95d
449+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
444450
- name: kind
445451
value: task
446452
resolver: bundles
@@ -461,7 +467,7 @@ spec:
461467
- name: name
462468
value: coverity-availability-check
463469
- name: bundle
464-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:8b58c4fae00c0dfe3937abfb8a9a61aa3c408cca4278b817db53d518428d944e
470+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
465471
- name: kind
466472
value: task
467473
resolver: bundles
@@ -487,7 +493,7 @@ spec:
487493
- name: name
488494
value: sast-shell-check-oci-ta
489495
- name: bundle
490-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
496+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
491497
- name: kind
492498
value: task
493499
resolver: bundles
@@ -504,14 +510,16 @@ spec:
504510
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
505511
- name: CACHI2_ARTIFACT
506512
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
513+
- name: image-digest
514+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
507515
runAfter:
508516
- build-image-index
509517
taskRef:
510518
params:
511519
- name: name
512520
value: sast-unicode-check-oci-ta
513521
- name: bundle
514-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:df185dbe4e2852668f9c46f938dd752e90ea9c79696363378435a6499596c319
522+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
515523
- name: kind
516524
value: task
517525
resolver: bundles
@@ -522,16 +530,18 @@ spec:
522530
- "false"
523531
- name: apply-tags
524532
params:
525-
- name: IMAGE
533+
- name: IMAGE_URL
526534
value: $(tasks.build-image-index.results.IMAGE_URL)
535+
- name: IMAGE_DIGEST
536+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
527537
runAfter:
528538
- build-image-index
529539
taskRef:
530540
params:
531541
- name: name
532542
value: apply-tags
533543
- name: bundle
534-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:9d9871143ab3a818f681488be6074f5b2f892c1843795a46f6daf3f5487e72d1
544+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
535545
- name: kind
536546
value: task
537547
resolver: bundles
@@ -554,7 +564,7 @@ spec:
554564
- name: name
555565
value: push-dockerfile-oci-ta
556566
- name: bundle
557-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:d0ee13ab3d9564f7ee806a8ceaced934db493a3a40e11ff6db3a912b8bbace95
567+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
558568
- name: kind
559569
value: task
560570
resolver: bundles
@@ -571,7 +581,7 @@ spec:
571581
- name: name
572582
value: rpms-signature-scan
573583
- name: bundle
574-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:297c2d8928aa3b114fcb1ba5d9da8b10226b68fed30706e78a6a5089c6cd30e3
584+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
575585
- name: kind
576586
value: task
577587
resolver: bundles

0 commit comments

Comments
 (0)