Skip to content

Commit bb70dd7

Browse files
ligangtyligangty
authored
Merge pull request #349 from Commonjava/konflux/references/kflux
Update Konflux references
2 parents a7aa23e + 5342c26 commit bb70dd7

File tree

2 files changed

+28
-12
lines changed

2 files changed

+28
-12
lines changed

‎.tekton/charon-pull-request.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ spec:
108108
description: Whether to enable privileged mode, should be used only with remote VMs
109109
name: privileged-nested
110110
type: string
111+
- name: buildah-format
112+
default: docker
113+
type: string
114+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
111115
results:
112116
- description: ""
113117
name: IMAGE_URL
@@ -135,7 +139,7 @@ spec:
135139
- name: name
136140
value: init
137141
- name: bundle
138-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
142+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
139143
- name: kind
140144
value: task
141145
resolver: bundles
@@ -156,7 +160,7 @@ spec:
156160
- name: name
157161
value: git-clone-oci-ta
158162
- name: bundle
159-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
163+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
160164
- name: kind
161165
value: task
162166
resolver: bundles
@@ -221,14 +225,16 @@ spec:
221225
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
222226
- name: CACHI2_ARTIFACT
223227
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
228+
- name: BUILDAH_FORMAT
229+
value: $(params.buildah-format)
224230
runAfter:
225231
- prefetch-dependencies
226232
taskRef:
227233
params:
228234
- name: name
229235
value: buildah-oci-ta
230236
- name: bundle
231-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
237+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:38d08ea58511a67f8754dc025feebdec8ae342fb4e25bc67a3726ec84f7cb7d1
232238
- name: kind
233239
value: task
234240
resolver: bundles
@@ -250,6 +256,8 @@ spec:
250256
- name: IMAGES
251257
value:
252258
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
259+
- name: BUILDAH_FORMAT
260+
value: $(params.buildah-format)
253261
runAfter:
254262
- build-container
255263
taskRef:
@@ -283,7 +291,7 @@ spec:
283291
- name: name
284292
value: source-build-oci-ta
285293
- name: bundle
286-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
294+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
287295
- name: kind
288296
value: task
289297
resolver: bundles
@@ -377,7 +385,7 @@ spec:
377385
- name: name
378386
value: sast-snyk-check-oci-ta
379387
- name: bundle
380-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
388+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
381389
- name: kind
382390
value: task
383391
resolver: bundles
@@ -562,7 +570,7 @@ spec:
562570
- name: name
563571
value: push-dockerfile-oci-ta
564572
- name: bundle
565-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
573+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
566574
- name: kind
567575
value: task
568576
resolver: bundles

‎.tekton/charon-push.yaml‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@ spec:
105105
description: Whether to enable privileged mode, should be used only with remote VMs
106106
name: privileged-nested
107107
type: string
108+
- name: buildah-format
109+
default: docker
110+
type: string
111+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
108112
results:
109113
- description: ""
110114
name: IMAGE_URL
@@ -132,7 +136,7 @@ spec:
132136
- name: name
133137
value: init
134138
- name: bundle
135-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
139+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
136140
- name: kind
137141
value: task
138142
resolver: bundles
@@ -153,7 +157,7 @@ spec:
153157
- name: name
154158
value: git-clone-oci-ta
155159
- name: bundle
156-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
160+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0d80f66610efd1f957700f61dcd5080689321b10ad544e136d58fc4673290d1b
157161
- name: kind
158162
value: task
159163
resolver: bundles
@@ -218,14 +222,16 @@ spec:
218222
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
219223
- name: CACHI2_ARTIFACT
220224
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
225+
- name: BUILDAH_FORMAT
226+
value: $(params.buildah-format)
221227
runAfter:
222228
- prefetch-dependencies
223229
taskRef:
224230
params:
225231
- name: name
226232
value: buildah-oci-ta
227233
- name: bundle
228-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
234+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:38d08ea58511a67f8754dc025feebdec8ae342fb4e25bc67a3726ec84f7cb7d1
229235
- name: kind
230236
value: task
231237
resolver: bundles
@@ -247,6 +253,8 @@ spec:
247253
- name: IMAGES
248254
value:
249255
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
256+
- name: BUILDAH_FORMAT
257+
value: $(params.buildah-format)
250258
runAfter:
251259
- build-container
252260
taskRef:
@@ -280,7 +288,7 @@ spec:
280288
- name: name
281289
value: source-build-oci-ta
282290
- name: bundle
283-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
291+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:36d44f2924f60da00a079a9ab7ce25ad8b2ad593c16d90509203c125ff0ccd46
284292
- name: kind
285293
value: task
286294
resolver: bundles
@@ -374,7 +382,7 @@ spec:
374382
- name: name
375383
value: sast-snyk-check-oci-ta
376384
- name: bundle
377-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
385+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
378386
- name: kind
379387
value: task
380388
resolver: bundles
@@ -559,7 +567,7 @@ spec:
559567
- name: name
560568
value: push-dockerfile-oci-ta
561569
- name: bundle
562-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
570+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:2bc5b3afc5de56da0f06eac60b65e86f6b861b16a63f48579fc0bac7d657e14c
563571
- name: kind
564572
value: task
565573
resolver: bundles

0 commit comments

Comments
 (0)