Skip to content

Commit f8c034d

Browse files
authored
Revert "chore(deps): update konflux references (#408)" (#422)
This reverts commit ade796f.
1 parent aeb3230 commit f8c034d

File tree

4 files changed

+62
-94
lines changed

4 files changed

+62
-94
lines changed

.tekton/operator-1-0-z-pull-request.yaml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,6 @@ spec:
113113
description: Whether to enable privileged mode, should be used only with remote VMs
114114
name: privileged-nested
115115
type: string
116-
- name: buildah-format
117-
default: docker
118-
type: string
119-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
120116
results:
121117
- description: ""
122118
name: IMAGE_URL
@@ -144,7 +140,7 @@ spec:
144140
- name: name
145141
value: init
146142
- name: bundle
147-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
143+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
148144
- name: kind
149145
value: task
150146
resolver: bundles
@@ -165,7 +161,7 @@ spec:
165161
- name: name
166162
value: git-clone-oci-ta
167163
- name: bundle
168-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
164+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
169165
- name: kind
170166
value: task
171167
resolver: bundles
@@ -194,7 +190,7 @@ spec:
194190
- name: name
195191
value: prefetch-dependencies-oci-ta
196192
- name: bundle
197-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0503f9313dfe70e4defda88a7226ec91a74af42198dccfa3280397d965aa16d6
193+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
198194
- name: kind
199195
value: task
200196
resolver: bundles
@@ -230,16 +226,14 @@ spec:
230226
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
231227
- name: CACHI2_ARTIFACT
232228
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
233-
- name: BUILDAH_FORMAT
234-
value: $(params.buildah-format)
235229
runAfter:
236230
- prefetch-dependencies
237231
taskRef:
238232
params:
239233
- name: name
240234
value: buildah-oci-ta
241235
- name: bundle
242-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:220bb6f39de7ab7d0ee0606c84623889e4141f2d216f519ffafc7252355bd174
236+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
243237
- name: kind
244238
value: task
245239
resolver: bundles
@@ -261,16 +255,14 @@ spec:
261255
- name: IMAGES
262256
value:
263257
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
264-
- name: BUILDAH_FORMAT
265-
value: $(params.buildah-format)
266258
runAfter:
267259
- build-container
268260
taskRef:
269261
params:
270262
- name: name
271263
value: build-image-index
272264
- name: bundle
273-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d4c07e29fbd9a7bdcec58b2ad15b656316f935a9009ea387adcb413aa3cd8ecd
265+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
274266
- name: kind
275267
value: task
276268
resolver: bundles
@@ -296,7 +288,7 @@ spec:
296288
- name: name
297289
value: source-build-oci-ta
298290
- name: bundle
299-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
291+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
300292
- name: kind
301293
value: task
302294
resolver: bundles
@@ -344,7 +336,7 @@ spec:
344336
- name: name
345337
value: clair-scan
346338
- name: bundle
347-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
339+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
348340
- name: kind
349341
value: task
350342
resolver: bundles
@@ -364,7 +356,7 @@ spec:
364356
- name: name
365357
value: ecosystem-cert-preflight-checks
366358
- name: bundle
367-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
359+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
368360
- name: kind
369361
value: task
370362
resolver: bundles
@@ -390,7 +382,7 @@ spec:
390382
- name: name
391383
value: sast-snyk-check-oci-ta
392384
- name: bundle
393-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
385+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
394386
- name: kind
395387
value: task
396388
resolver: bundles
@@ -412,7 +404,7 @@ spec:
412404
- name: name
413405
value: clamav-scan
414406
- name: bundle
415-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
407+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
416408
- name: kind
417409
value: task
418410
resolver: bundles
@@ -457,7 +449,7 @@ spec:
457449
- name: name
458450
value: sast-coverity-check-oci-ta
459451
- name: bundle
460-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:ae62d14c999fd93246fef4e57d28570fa5200c3266b9a3263a39965e5a5b02d7
452+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
461453
- name: kind
462454
value: task
463455
resolver: bundles
@@ -478,7 +470,7 @@ spec:
478470
- name: name
479471
value: coverity-availability-check
480472
- name: bundle
481-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:5623e48314ffd583e9cab383011dc0763b6c92b09c4f427b8bfcca885394a21c
473+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
482474
- name: kind
483475
value: task
484476
resolver: bundles
@@ -504,7 +496,7 @@ spec:
504496
- name: name
505497
value: sast-shell-check-oci-ta
506498
- name: bundle
507-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
499+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
508500
- name: kind
509501
value: task
510502
resolver: bundles
@@ -530,7 +522,7 @@ spec:
530522
- name: name
531523
value: sast-unicode-check-oci-ta
532524
- name: bundle
533-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
525+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
534526
- name: kind
535527
value: task
536528
resolver: bundles
@@ -575,7 +567,7 @@ spec:
575567
- name: name
576568
value: push-dockerfile-oci-ta
577569
- name: bundle
578-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
570+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
579571
- name: kind
580572
value: task
581573
resolver: bundles

.tekton/operator-1-0-z-push.yaml

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,6 @@ spec:
115115
description: Whether to enable privileged mode, should be used only with remote VMs
116116
name: privileged-nested
117117
type: string
118-
- name: buildah-format
119-
default: docker
120-
type: string
121-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
122118
results:
123119
- description: ""
124120
name: IMAGE_URL
@@ -146,7 +142,7 @@ spec:
146142
- name: name
147143
value: init
148144
- name: bundle
149-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
145+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
150146
- name: kind
151147
value: task
152148
resolver: bundles
@@ -167,7 +163,7 @@ spec:
167163
- name: name
168164
value: git-clone-oci-ta
169165
- name: bundle
170-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
166+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
171167
- name: kind
172168
value: task
173169
resolver: bundles
@@ -196,7 +192,7 @@ spec:
196192
- name: name
197193
value: prefetch-dependencies-oci-ta
198194
- name: bundle
199-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0503f9313dfe70e4defda88a7226ec91a74af42198dccfa3280397d965aa16d6
195+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
200196
- name: kind
201197
value: task
202198
resolver: bundles
@@ -232,16 +228,14 @@ spec:
232228
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
233229
- name: CACHI2_ARTIFACT
234230
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
235-
- name: BUILDAH_FORMAT
236-
value: $(params.buildah-format)
237231
runAfter:
238232
- prefetch-dependencies
239233
taskRef:
240234
params:
241235
- name: name
242236
value: buildah-oci-ta
243237
- name: bundle
244-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:220bb6f39de7ab7d0ee0606c84623889e4141f2d216f519ffafc7252355bd174
238+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
245239
- name: kind
246240
value: task
247241
resolver: bundles
@@ -263,16 +257,14 @@ spec:
263257
- name: IMAGES
264258
value:
265259
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
266-
- name: BUILDAH_FORMAT
267-
value: $(params.buildah-format)
268260
runAfter:
269261
- build-container
270262
taskRef:
271263
params:
272264
- name: name
273265
value: build-image-index
274266
- name: bundle
275-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d4c07e29fbd9a7bdcec58b2ad15b656316f935a9009ea387adcb413aa3cd8ecd
267+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
276268
- name: kind
277269
value: task
278270
resolver: bundles
@@ -298,7 +290,7 @@ spec:
298290
- name: name
299291
value: source-build-oci-ta
300292
- name: bundle
301-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
293+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
302294
- name: kind
303295
value: task
304296
resolver: bundles
@@ -346,7 +338,7 @@ spec:
346338
- name: name
347339
value: clair-scan
348340
- name: bundle
349-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
341+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
350342
- name: kind
351343
value: task
352344
resolver: bundles
@@ -366,7 +358,7 @@ spec:
366358
- name: name
367359
value: ecosystem-cert-preflight-checks
368360
- name: bundle
369-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
361+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
370362
- name: kind
371363
value: task
372364
resolver: bundles
@@ -392,7 +384,7 @@ spec:
392384
- name: name
393385
value: sast-snyk-check-oci-ta
394386
- name: bundle
395-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
387+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
396388
- name: kind
397389
value: task
398390
resolver: bundles
@@ -414,7 +406,7 @@ spec:
414406
- name: name
415407
value: clamav-scan
416408
- name: bundle
417-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
409+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
418410
- name: kind
419411
value: task
420412
resolver: bundles
@@ -459,7 +451,7 @@ spec:
459451
- name: name
460452
value: sast-coverity-check-oci-ta
461453
- name: bundle
462-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:ae62d14c999fd93246fef4e57d28570fa5200c3266b9a3263a39965e5a5b02d7
454+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:cdbe1a968676e4f5519b082bf1e27a4cdcf66dd60af66dbc26b3e604f957f7e9
463455
- name: kind
464456
value: task
465457
resolver: bundles
@@ -480,7 +472,7 @@ spec:
480472
- name: name
481473
value: coverity-availability-check
482474
- name: bundle
483-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:5623e48314ffd583e9cab383011dc0763b6c92b09c4f427b8bfcca885394a21c
475+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
484476
- name: kind
485477
value: task
486478
resolver: bundles
@@ -506,7 +498,7 @@ spec:
506498
- name: name
507499
value: sast-shell-check-oci-ta
508500
- name: bundle
509-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
501+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
510502
- name: kind
511503
value: task
512504
resolver: bundles
@@ -532,7 +524,7 @@ spec:
532524
- name: name
533525
value: sast-unicode-check-oci-ta
534526
- name: bundle
535-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
527+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
536528
- name: kind
537529
value: task
538530
resolver: bundles
@@ -548,7 +540,7 @@ spec:
548540
- name: IMAGE_DIGEST
549541
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
550542
- name: ADDITIONAL_TAGS
551-
value: ['$(params.version)$(params.version-postfix-qe)', '{{revision}}']
543+
value: ['$(params.version)$(params.version-postfix-qe)','{{revision}}']
552544
runAfter:
553545
- build-image-index
554546
taskRef:
@@ -579,7 +571,7 @@ spec:
579571
- name: name
580572
value: push-dockerfile-oci-ta
581573
- name: bundle
582-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
574+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
583575
- name: kind
584576
value: task
585577
resolver: bundles

0 commit comments

Comments
 (0)