Skip to content

Commit 120e7e1

Browse files
jacobbaungardkonflux
jacobbaungard
and
konflux
authored
Konflux update (#220)
* Konflux build pipeline service account migration for thanos-acm-214 Signed-off-by: konflux <[email protected]> * Update Konflux Tasks Signed-off-by: Jacob Baungard Hansen <[email protected]> * Konflux: Migrate source-build and buildah tasks Signed-off-by: Jacob Baungard Hansen <[email protected]> * Konflux: Further task migrations Signed-off-by: Jacob Baungard Hansen <[email protected]> --------- Signed-off-by: Jacob Baungard Hansen <[email protected]> Co-authored-by: konflux <[email protected]>
1 parent 946e827 commit 120e7e1

File tree

2 files changed

+108
-110
lines changed

2 files changed

+108
-110
lines changed

‎.tekton/thanos-acm-214-pull-request.yaml‎

Lines changed: 54 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
- name: path-context
3535
value: .
3636
- name: hermetic
37-
value: true
37+
value: "true"
3838
- name: prefetch-input
3939
value: '[{"path": ".", "type": "gomod"}, {"path": "promu/", "type": "gomod"}]'
4040
- name: build-source-image
@@ -55,7 +55,7 @@ spec:
5555
- name: name
5656
value: show-sbom
5757
- name: bundle
58-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:945a7c9066d3e0a95d3fddb7e8a6992e4d632a2a75d8f3a9bd2ff2fef0ec9aa0
58+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:002f7c8c1d2f9e09904035da414aba1188ae091df0ea9532cd997be05e73d594
5959
- name: kind
6060
value: task
6161
resolver: bundles
@@ -149,7 +149,7 @@ spec:
149149
- name: name
150150
value: init
151151
- name: bundle
152-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:4c6712db9419461b8c8a39523c012cb0dc061fb58563bb9170b3777d74f54659
152+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:7a24924417260b7094541caaedd2853dc8da08d4bb0968f710a400d3e8062063
153153
- name: kind
154154
value: task
155155
resolver: bundles
@@ -170,7 +170,7 @@ spec:
170170
- name: name
171171
value: git-clone-oci-ta
172172
- name: bundle
173-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:36d98ab04eaac2c964149060c773ac20df42f91527db6c40b7b250e6eeff5821
173+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:8ecf57d5a6697ce709bee65b62781efe79a10b0c2b95e05576442b67fbd61744
174174
- name: kind
175175
value: task
176176
resolver: bundles
@@ -199,7 +199,7 @@ spec:
199199
- name: name
200200
value: prefetch-dependencies-oci-ta
201201
- name: bundle
202-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.1@sha256:593714c3b029ef748a38d6cefea122294df2390172d7694b720be62bb416ff59
202+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d48c621ae828a3cbca162e12ec166210d2d77a7ba23b0e5d60c4a1b94491adeb
203203
- name: kind
204204
value: task
205205
resolver: bundles
@@ -247,7 +247,7 @@ spec:
247247
- name: name
248248
value: buildah-remote-oci-ta
249249
- name: bundle
250-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:3b72f86d0d659d5e4b8d36afa8d2263dd5d9c591d202382a431f039827a72d2b
250+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:6a5f714dd0c301ac421c232d2658e336b862681cf0bcbcbf01ef38d8969664e0
251251
- name: kind
252252
value: task
253253
resolver: bundles
@@ -276,7 +276,7 @@ spec:
276276
- name: name
277277
value: build-image-index
278278
- name: bundle
279-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:be5e5d4ef43f14f6dc3f8da4df52b3e3b2529f9d64e706471b0317b5a07a9046
279+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:462ecbf94ec44a8b770d6ef8838955f91f57ee79795e5c18bdc0fcb0df593742
280280
- name: kind
281281
value: task
282282
resolver: bundles
@@ -300,7 +300,7 @@ spec:
300300
- name: name
301301
value: source-build-oci-ta
302302
- name: bundle
303-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.1@sha256:18241f95266a5e4316449f25a600f0f035d32a81c72ecd609a7e886de1843163
303+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:56fa2cbfc04bad4765b7fe1fa8022587f4042d4e8533bb5f65311d46b43226ee
304304
- name: kind
305305
value: task
306306
resolver: bundles
@@ -326,7 +326,7 @@ spec:
326326
- name: name
327327
value: deprecated-image-check
328328
- name: bundle
329-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:241f87f75a6e4303fbd64b32ba1715d76fe3805c48a6c21829e6a564bcc3a576
329+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:eb8136b543147b4a3e88ca3cc661ca6a11e303f35f0db44059f69151beea8496
330330
- name: kind
331331
value: task
332332
resolver: bundles
@@ -348,7 +348,7 @@ spec:
348348
- name: name
349349
value: clair-scan
350350
- name: bundle
351-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:f636f2cbe91d9d4d9685a38c8bc680a36e17f568ec0e60a93da82d1284b488c5
351+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:7c73e2beca9b8306387efeaf775831440ec799b05a5f5c008a65bb941a1e91f6
352352
- name: kind
353353
value: task
354354
resolver: bundles
@@ -368,7 +368,7 @@ spec:
368368
- name: name
369369
value: ecosystem-cert-preflight-checks
370370
- name: bundle
371-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:df8a25a3431a70544172ed4844f9d0c6229d39130633960729f825a031a7dea9
371+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.1@sha256:7c2438c6201ee803de361fa2e9182fdc759126d5bc010abbbddf5aa40c7adc3c
372372
- name: kind
373373
value: task
374374
resolver: bundles
@@ -394,7 +394,7 @@ spec:
394394
- name: name
395395
value: sast-snyk-check-oci-ta
396396
- name: bundle
397-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:8a29b92cae7276bcf4de8ea4b181ab18c1aaed9ffb1d77845751d5f2ae70a953
397+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.2@sha256:56b2f4c9f27f3571e92b39563cd987bd5c25e4bfc7ea47ffef76f9b313990577
398398
- name: kind
399399
value: task
400400
resolver: bundles
@@ -405,56 +405,54 @@ spec:
405405
- "false"
406406
- name: sast-unicode-check
407407
params:
408-
- name: image-url
409-
value: $(tasks.build-image-index.results.IMAGE_URL)
410-
- name: SOURCE_ARTIFACT
411-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
412-
- name: CACHI2_ARTIFACT
413-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
408+
- name: image-url
409+
value: $(tasks.build-image-index.results.IMAGE_URL)
410+
- name: SOURCE_ARTIFACT
411+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
412+
- name: CACHI2_ARTIFACT
413+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
414414
runAfter:
415-
- build-image-index
415+
- build-image-index
416416
taskRef:
417417
params:
418-
- name: name
419-
value: sast-unicode-check-oci-ta
420-
- name: bundle
421-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:424f2f659c02998dc3a43e1ce869e3148982c59adb74f953f8fa91ff1c9ab86e
422-
- name: kind
423-
value: task
418+
- name: name
419+
value: sast-unicode-check-oci-ta
420+
- name: bundle
421+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.1@sha256:4581e7ef9edc2166a8aef7eed8dd21090393307a40dbc4841266bcac88a7709f
422+
- name: kind
423+
value: task
424424
resolver: bundles
425425
when:
426-
- input: $(params.skip-checks)
427-
operator: in
428-
values:
429-
- "false"
430-
workspaces: []
426+
- input: $(params.skip-checks)
427+
operator: in
428+
values:
429+
- "false"
431430
- name: sast-shell-check
432431
params:
433-
- name: image-digest
434-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
435-
- name: image-url
436-
value: $(tasks.build-image-index.results.IMAGE_URL)
437-
- name: SOURCE_ARTIFACT
438-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
439-
- name: CACHI2_ARTIFACT
440-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
432+
- name: image-digest
433+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
434+
- name: image-url
435+
value: $(tasks.build-image-index.results.IMAGE_URL)
436+
- name: SOURCE_ARTIFACT
437+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
438+
- name: CACHI2_ARTIFACT
439+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
441440
runAfter:
442-
- build-image-index
441+
- build-image-index
443442
taskRef:
444443
params:
445-
- name: name
446-
value: sast-shell-check-oci-ta
447-
- name: bundle
448-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:a591675c72f06fb9c5b1a3d60e6e4c58e4df5f7da180c7a4691a692a6e7e6496
449-
- name: kind
450-
value: task
444+
- name: name
445+
value: sast-shell-check-oci-ta
446+
- name: bundle
447+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:57b3262138eb06186ae7375f84ca53788bba2a66cfd03d39cb82c78df050aba5
448+
- name: kind
449+
value: task
451450
resolver: bundles
452451
when:
453-
- input: $(params.skip-checks)
454-
operator: in
455-
values:
456-
- "false"
457-
workspaces: []
452+
- input: $(params.skip-checks)
453+
operator: in
454+
values:
455+
- "false"
458456
- name: clamav-scan
459457
params:
460458
- name: image-digest
@@ -468,7 +466,7 @@ spec:
468466
- name: name
469467
value: clamav-scan
470468
- name: bundle
471-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:efd71f3d7274db97ea96ae41ce34dd5439ab4c5f144e13a7046054002dfb62c1
469+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.1@sha256:ccb2045bd5753a0cb19e4d6a11162600d5daf79a61d6c015f109853231a24770
472470
- name: kind
473471
value: task
474472
resolver: bundles
@@ -488,7 +486,7 @@ spec:
488486
- name: name
489487
value: apply-tags
490488
- name: bundle
491-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:fa7aa88ffe01eeeaa07c8720b27e50e27f6f136ef33595efaa16a0eb4598ea02
489+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:3f89ba89cacf8547261b5ce064acce81bfe470c8ace127794d0e90aebc8c347d
492490
- name: kind
493491
value: task
494492
resolver: bundles
@@ -511,7 +509,7 @@ spec:
511509
- name: name
512510
value: push-dockerfile-oci-ta
513511
- name: bundle
514-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:fcd9016f1cd5d1085b5e823cdf04a4e77ce80f67d0990af7853e70755aa25d54
512+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:278f84550844c1c050a65536799f4b54e7c203e0ac51393aa75379dd974c82e9
515513
- name: kind
516514
value: task
517515
resolver: bundles
@@ -528,7 +526,7 @@ spec:
528526
- name: name
529527
value: rpms-signature-scan
530528
- name: bundle
531-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:3bf6d1bcd57af1095b06b4c489f965551364b1f1f72a807de9cab3c23142dca5
529+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:297c2d8928aa3b114fcb1ba5d9da8b10226b68fed30706e78a6a5089c6cd30e3
532530
- name: kind
533531
value: task
534532
resolver: bundles
@@ -542,7 +540,8 @@ spec:
542540
optional: true
543541
- name: netrc
544542
optional: true
545-
taskRunTemplate: {}
543+
taskRunTemplate:
544+
serviceAccountName: build-pipeline-thanos-acm-214
546545
workspaces:
547546
- name: git-auth
548547
secret:

0 commit comments

Comments
 (0)