Skip to content

Commit 872e081

Browse files
lmillerilmilleri
authored
Merge pull request #256 from lmilleri/fix-fips
Fix trustee-operator build
2 parents ef8bd7b + 8bf6a0f commit 872e081

9 files changed

Lines changed: 105 additions & 184 deletions

‎.tekton/trustee-operator-bundle-pull-request.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ spec:
138138
- name: name
139139
value: init
140140
- name: bundle
141-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
141+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
142142
- name: kind
143143
value: task
144144
resolver: bundles
@@ -260,7 +260,7 @@ spec:
260260
- name: name
261261
value: build-image-index
262262
- name: bundle
263-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
263+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
264264
- name: kind
265265
value: task
266266
resolver: bundles
@@ -312,7 +312,7 @@ spec:
312312
- name: name
313313
value: deprecated-image-check
314314
- name: bundle
315-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
315+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
316316
- name: kind
317317
value: task
318318
resolver: bundles
@@ -380,7 +380,7 @@ spec:
380380
- name: name
381381
value: sast-snyk-check-oci-ta
382382
- name: bundle
383-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
383+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:181d63c126e3119a9d57b8feed4eb66a875b5208c3e90724c22758e65dca8733
384384
- name: kind
385385
value: task
386386
resolver: bundles
@@ -402,7 +402,7 @@ spec:
402402
- name: name
403403
value: clamav-scan
404404
- name: bundle
405-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
405+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
406406
- name: kind
407407
value: task
408408
resolver: bundles
@@ -468,7 +468,7 @@ spec:
468468
- name: name
469469
value: coverity-availability-check
470470
- name: bundle
471-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:5623e48314ffd583e9cab383011dc0763b6c92b09c4f427b8bfcca885394a21c
471+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
472472
- name: kind
473473
value: task
474474
resolver: bundles
@@ -494,7 +494,7 @@ spec:
494494
- name: name
495495
value: sast-shell-check-oci-ta
496496
- name: bundle
497-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
497+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:f950c3cefcff91de751f4d24a297c3312a2b265dd54478193ba1330791976c35
498498
- name: kind
499499
value: task
500500
resolver: bundles
@@ -520,7 +520,7 @@ spec:
520520
- name: name
521521
value: sast-unicode-check-oci-ta
522522
- name: bundle
523-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
523+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1cf8f6f6e991e1820cbebddaf9f38442a2ea5669956c9ffc2b7e4698ae7e99be
524524
- name: kind
525525
value: task
526526
resolver: bundles
@@ -542,7 +542,7 @@ spec:
542542
- name: name
543543
value: apply-tags
544544
- name: bundle
545-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
545+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
546546
- name: kind
547547
value: task
548548
resolver: bundles
@@ -582,7 +582,7 @@ spec:
582582
- name: name
583583
value: rpms-signature-scan
584584
- name: bundle
585-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
585+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
586586
- name: kind
587587
value: task
588588
resolver: bundles

‎.tekton/trustee-operator-bundle-push.yaml‎

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ spec:
109109
description: Whether to enable privileged mode, should be used only with remote VMs
110110
name: privileged-nested
111111
type: string
112+
- name: buildah-format
113+
default: docker
114+
type: string
115+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112116
results:
113117
- description: ""
114118
name: IMAGE_URL
@@ -136,7 +140,7 @@ spec:
136140
- name: name
137141
value: init
138142
- name: bundle
139-
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:bbf313b09740fb39b3343bc69ee94b2a2c21d16a9304f9b7c111c305558fc346
140144
- name: kind
141145
value: task
142146
resolver: bundles
@@ -251,14 +255,16 @@ spec:
251255
- name: IMAGES
252256
value:
253257
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
258+
- name: BUILDAH_FORMAT
259+
value: $(params.buildah-format)
254260
runAfter:
255261
- build-container
256262
taskRef:
257263
params:
258264
- name: name
259265
value: build-image-index
260266
- name: bundle
261-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
267+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:d94cad7f41be61074dd21c7dff26dab9217c3435a16f62813c1cb8382dd9aae6
262268
- name: kind
263269
value: task
264270
resolver: bundles
@@ -310,7 +316,7 @@ spec:
310316
- name: name
311317
value: deprecated-image-check
312318
- name: bundle
313-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
319+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
314320
- name: kind
315321
value: task
316322
resolver: bundles
@@ -367,18 +373,14 @@ spec:
367373
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
368374
- name: image-url
369375
value: $(tasks.build-image-index.results.IMAGE_URL)
370-
- name: SOURCE_ARTIFACT
371-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
372-
- name: CACHI2_ARTIFACT
373-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
374376
runAfter:
375377
- build-image-index
376378
taskRef:
377379
params:
378380
- name: name
379-
value: sast-snyk-check-oci-ta
381+
value: sast-snyk-check
380382
- name: bundle
381-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:60f2dac41844d222086ff7f477e51f3563716b183d87db89f603d6f604c21760
383+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:b487b08bd617d28adb47ee7c217b148b26b22bf906775b9f0ae7055acd042416
382384
- name: kind
383385
value: task
384386
resolver: bundles
@@ -400,7 +402,7 @@ spec:
400402
- name: name
401403
value: clamav-scan
402404
- name: bundle
403-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:f3d2d179cddcc07d0228d9f52959a233037a3afa2619d0a8b2effbb467db80c3
405+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
404406
- name: kind
405407
value: task
406408
resolver: bundles
@@ -443,9 +445,9 @@ spec:
443445
taskRef:
444446
params:
445447
- name: name
446-
value: sast-coverity-check-oci-ta
448+
value: sast-coverity-check
447449
- name: bundle
448-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:ae62d14c999fd93246fef4e57d28570fa5200c3266b9a3263a39965e5a5b02d7
450+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check:0.3@sha256:9d572d7f7486224318d59de1b166efa68e59e17bac0785e2ecdcd014fe8e44d5
449451
- name: kind
450452
value: task
451453
resolver: bundles
@@ -466,7 +468,7 @@ spec:
466468
- name: name
467469
value: coverity-availability-check
468470
- name: bundle
469-
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:5623e48314ffd583e9cab383011dc0763b6c92b09c4f427b8bfcca885394a21c
471+
value: quay.io/konflux-ci/tekton-catalog/task-coverity-availability-check:0.2@sha256:db2b267dc15e4ed17f704ee91b8e9b38068e1a35b1018a328fdca621819d74c6
470472
- name: kind
471473
value: task
472474
resolver: bundles
@@ -481,18 +483,14 @@ spec:
481483
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
482484
- name: image-url
483485
value: $(tasks.build-image-index.results.IMAGE_URL)
484-
- name: SOURCE_ARTIFACT
485-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
486-
- name: CACHI2_ARTIFACT
487-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
488486
runAfter:
489487
- build-image-index
490488
taskRef:
491489
params:
492490
- name: name
493-
value: sast-shell-check-oci-ta
491+
value: sast-shell-check
494492
- name: bundle
495-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1f0fcba24ebc447d9f8a2ea2e8f262fa435d6c523ca6b0346cd67261551fc9ed
493+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check:0.1@sha256:cdfb0f552b30e7bb38a87c6b10ea3cd7f8dbf2e3b913fe27319cd9588c6d49e6
496494
- name: kind
497495
value: task
498496
resolver: bundles
@@ -507,18 +505,14 @@ spec:
507505
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
508506
- name: image-url
509507
value: $(tasks.build-image-index.results.IMAGE_URL)
510-
- name: SOURCE_ARTIFACT
511-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
512-
- name: CACHI2_ARTIFACT
513-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
514508
runAfter:
515509
- build-image-index
516510
taskRef:
517511
params:
518512
- name: name
519-
value: sast-unicode-check-oci-ta
513+
value: sast-unicode-check
520514
- name: bundle
521-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:1833c618170ab9deb8455667f220df8e88d16ccd630a2361366f594e2bdcb712
515+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check:0.3@sha256:23c7a716cf5596d5b09e57a13ad20572de2a13d47bf708b13141f5e341845133
522516
- name: kind
523517
value: task
524518
resolver: bundles
@@ -540,7 +534,7 @@ spec:
540534
- name: name
541535
value: apply-tags
542536
- name: bundle
543-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
537+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
544538
- name: kind
545539
value: task
546540
resolver: bundles
@@ -580,7 +574,7 @@ spec:
580574
- name: name
581575
value: rpms-signature-scan
582576
- name: bundle
583-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:78c8d7960c6db284356d94aaae64d1fca34fff4de6a6e20d897a088af0c81cf5
577+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
584578
- name: kind
585579
value: task
586580
resolver: bundles

0 commit comments

Comments
 (0)