Skip to content

Commit 8725e19

Browse files
shajmakhshajmakh
authored
Merge pull request #2194 from openshift-kni/konflux/references/main
chore(deps): update konflux references
2 parents a27fb5f + 29b7550 commit 8725e19

File tree

3 files changed

+41
-17
lines changed

3 files changed

+41
-17
lines changed

‎.tekton/build-pipeline-must-gather.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ spec:
9797
description: Skip the sast coverity check
9898
name: skip-sast-coverity
9999
type: string
100+
- name: buildah-format
101+
default: docker
102+
type: string
103+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
100104
results:
101105
- description: ""
102106
name: IMAGE_URL
@@ -124,7 +128,7 @@ spec:
124128
- name: name
125129
value: init
126130
- name: bundle
127-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
131+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
128132
- name: kind
129133
value: task
130134
resolver: bundles
@@ -145,7 +149,7 @@ spec:
145149
- name: name
146150
value: git-clone-oci-ta
147151
- name: bundle
148-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
152+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
149153
- name: kind
150154
value: task
151155
resolver: bundles
@@ -219,14 +223,16 @@ spec:
219223
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
220224
- name: IMAGE_APPEND_PLATFORM
221225
value: "true"
226+
- name: BUILDAH_FORMAT
227+
value: $(params.buildah-format)
222228
runAfter:
223229
- prefetch-dependencies
224230
taskRef:
225231
params:
226232
- name: name
227233
value: buildah-remote-oci-ta
228234
- name: bundle
229-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:650b0bca57c626c1e82f35cdfadf44a7792230b2b992aaa9c369d615aae6590d
235+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
230236
- name: kind
231237
value: task
232238
resolver: bundles
@@ -248,6 +254,8 @@ spec:
248254
- name: IMAGES
249255
value:
250256
- $(tasks.build-images.results.IMAGE_REF[*])
257+
- name: BUILDAH_FORMAT
258+
value: $(params.buildah-format)
251259
runAfter:
252260
- build-images
253261
taskRef:
@@ -281,7 +289,7 @@ spec:
281289
- name: name
282290
value: source-build-oci-ta
283291
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
292+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
285293
- name: kind
286294
value: task
287295
resolver: bundles
@@ -384,7 +392,7 @@ spec:
384392
- name: name
385393
value: sast-snyk-check-oci-ta
386394
- name: bundle
387-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
395+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
388396
- name: kind
389397
value: task
390398
resolver: bundles
@@ -573,7 +581,7 @@ spec:
573581
- name: name
574582
value: push-dockerfile-oci-ta
575583
- name: bundle
576-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
584+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
577585
- name: kind
578586
value: task
579587
resolver: bundles

‎.tekton/build-pipeline.yaml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,10 @@ spec:
9797
description: Whether to append the platform string to the end of the build image tag
9898
name: image-append-platform
9999
type: string
100+
- name: buildah-format
101+
default: docker
102+
type: string
103+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
100104
results:
101105
- description: ""
102106
name: IMAGE_URL
@@ -124,7 +128,7 @@ spec:
124128
- name: name
125129
value: init
126130
- name: bundle
127-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
131+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
128132
- name: kind
129133
value: task
130134
resolver: bundles
@@ -145,7 +149,7 @@ spec:
145149
- name: name
146150
value: git-clone-oci-ta
147151
- name: bundle
148-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
152+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
149153
- name: kind
150154
value: task
151155
resolver: bundles
@@ -173,7 +177,7 @@ spec:
173177
- name: name
174178
value: generate-labels
175179
- name: bundle
176-
value: quay.io/konflux-ci/tekton-catalog/task-generate-labels:0.1@sha256:9d5bc8e93a458102ea119c6828a654ae5ee5e9d0aa0ab462f01d2ebac268e737
180+
value: quay.io/konflux-ci/tekton-catalog/task-generate-labels:0.1@sha256:e7ad8a5faf9e95d5fc8f567ce83adb6b5b9ad1700196d65b822864f13c9d7f66
177181
- name: kind
178182
value: task
179183
resolver: bundles
@@ -242,14 +246,16 @@ spec:
242246
- name: LABELS
243247
value:
244248
- $(tasks.generate-labels.results.labels[*])
249+
- name: BUILDAH_FORMAT
250+
value: $(params.buildah-format)
245251
runAfter:
246252
- prefetch-dependencies
247253
taskRef:
248254
params:
249255
- name: name
250256
value: buildah-remote-oci-ta
251257
- name: bundle
252-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:650b0bca57c626c1e82f35cdfadf44a7792230b2b992aaa9c369d615aae6590d
258+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
253259
- name: kind
254260
value: task
255261
resolver: bundles
@@ -271,6 +277,8 @@ spec:
271277
- name: IMAGES
272278
value:
273279
- $(tasks.build-images.results.IMAGE_REF[*])
280+
- name: BUILDAH_FORMAT
281+
value: $(params.buildah-format)
274282
runAfter:
275283
- build-images
276284
taskRef:
@@ -304,7 +312,7 @@ spec:
304312
- name: name
305313
value: source-build-oci-ta
306314
- name: bundle
307-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
315+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
308316
- name: kind
309317
value: task
310318
resolver: bundles
@@ -407,7 +415,7 @@ spec:
407415
- name: name
408416
value: sast-snyk-check-oci-ta
409417
- name: bundle
410-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
418+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
411419
- name: kind
412420
value: task
413421
resolver: bundles
@@ -594,7 +602,7 @@ spec:
594602
- name: name
595603
value: push-dockerfile-oci-ta
596604
- name: bundle
597-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
605+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
598606
- name: kind
599607
value: task
600608
resolver: bundles

‎.tekton/fbc-pipeline.yaml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,10 @@ spec:
8484
description: Additional tags to apply to the built container image
8585
name: additional-tags
8686
type: array
87+
- name: buildah-format
88+
default: oci
89+
type: string
90+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
8791
results:
8892
- description: ""
8993
name: IMAGE_URL
@@ -111,7 +115,7 @@ spec:
111115
- name: name
112116
value: init
113117
- name: bundle
114-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
118+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
115119
- name: kind
116120
value: task
117121
resolver: bundles
@@ -132,7 +136,7 @@ spec:
132136
- name: name
133137
value: git-clone-oci-ta
134138
- name: bundle
135-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
139+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
136140
- name: kind
137141
value: task
138142
resolver: bundles
@@ -204,14 +208,16 @@ spec:
204208
value: "true"
205209
- name: ADDITIONAL_SECRET
206210
value: telco-5g-redhat-pull-secret
211+
- name: BUILDAH_FORMAT
212+
value: $(params.buildah-format)
207213
runAfter:
208214
- clone-repository
209215
taskRef:
210216
params:
211217
- name: name
212218
value: buildah-remote-oci-ta
213219
- name: bundle
214-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:650b0bca57c626c1e82f35cdfadf44a7792230b2b992aaa9c369d615aae6590d
220+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:5e59c05455619580f4383010726f7db8440ecf6959882e9053ac697dd6d277fd
215221
- name: kind
216222
value: task
217223
resolver: bundles
@@ -233,6 +239,8 @@ spec:
233239
- name: IMAGES
234240
value:
235241
- $(tasks.build-images.results.IMAGE_REF[*])
242+
- name: BUILDAH_FORMAT
243+
value: $(params.buildah-format)
236244
runAfter:
237245
- build-images
238246
taskRef:
@@ -353,7 +361,7 @@ spec:
353361
- name: name
354362
value: fbc-fips-check-oci-ta
355363
- name: bundle
356-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:46fad72e5586eb7a772d97b2ceac10cf088851ea9eeef16aaa104d5d80dac50a
364+
value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:286eff4264fc502de7be64d77fee8cc17a44b13174c2bc1618cef40677cb53e6
357365
- name: kind
358366
value: task
359367
resolver: bundles

0 commit comments

Comments
 (0)