Skip to content

Commit f000cf1

Browse files
vibe13vibe13
authored
Merge branch 'main' into konflux/references/main
2 parents 672046a + f5ea897 commit f000cf1

8 files changed

+0
-208
lines changed

‎.tekton/build-request-processor-pull-request.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ spec:
256256
params:
257257
- name: BINARY_IMAGE
258258
value: $(params.output-image)
259-
- name: BASE_IMAGES
260-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
261259
runAfter:
262260
- build-container
263261
taskRef:
@@ -283,8 +281,6 @@ spec:
283281
workspace: workspace
284282
- name: deprecated-base-image-check
285283
params:
286-
- name: BASE_IMAGES_DIGESTS
287-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
288284
- name: IMAGE_URL
289285
value: $(tasks.build-container.results.IMAGE_URL)
290286
- name: IMAGE_DIGEST
@@ -394,28 +390,6 @@ spec:
394390
operator: in
395391
values:
396392
- "false"
397-
- name: sbom-json-check
398-
params:
399-
- name: IMAGE_URL
400-
value: $(tasks.build-container.results.IMAGE_URL)
401-
- name: IMAGE_DIGEST
402-
value: $(tasks.build-container.results.IMAGE_DIGEST)
403-
runAfter:
404-
- build-container
405-
taskRef:
406-
params:
407-
- name: name
408-
value: sbom-json-check
409-
- name: bundle
410-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
411-
- name: kind
412-
value: task
413-
resolver: bundles
414-
when:
415-
- input: $(params.skip-checks)
416-
operator: in
417-
values:
418-
- "false"
419393
- name: apply-tags
420394
params:
421395
- name: IMAGE

‎.tekton/build-request-processor-push.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ spec:
253253
params:
254254
- name: BINARY_IMAGE
255255
value: $(params.output-image)
256-
- name: BASE_IMAGES
257-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
258256
runAfter:
259257
- build-container
260258
taskRef:
@@ -280,8 +278,6 @@ spec:
280278
workspace: workspace
281279
- name: deprecated-base-image-check
282280
params:
283-
- name: BASE_IMAGES_DIGESTS
284-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
285281
- name: IMAGE_URL
286282
value: $(tasks.build-container.results.IMAGE_URL)
287283
- name: IMAGE_DIGEST
@@ -391,28 +387,6 @@ spec:
391387
operator: in
392388
values:
393389
- "false"
394-
- name: sbom-json-check
395-
params:
396-
- name: IMAGE_URL
397-
value: $(tasks.build-container.results.IMAGE_URL)
398-
- name: IMAGE_DIGEST
399-
value: $(tasks.build-container.results.IMAGE_DIGEST)
400-
runAfter:
401-
- build-container
402-
taskRef:
403-
params:
404-
- name: name
405-
value: sbom-json-check
406-
- name: bundle
407-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
408-
- name: kind
409-
value: task
410-
resolver: bundles
411-
when:
412-
- input: $(params.skip-checks)
413-
operator: in
414-
values:
415-
- "false"
416390
- name: apply-tags
417391
params:
418392
- name: IMAGE

‎.tekton/cache-pull-request.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ spec:
256256
params:
257257
- name: BINARY_IMAGE
258258
value: $(params.output-image)
259-
- name: BASE_IMAGES
260-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
261259
runAfter:
262260
- build-container
263261
taskRef:
@@ -283,8 +281,6 @@ spec:
283281
workspace: workspace
284282
- name: deprecated-base-image-check
285283
params:
286-
- name: BASE_IMAGES_DIGESTS
287-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
288284
- name: IMAGE_URL
289285
value: $(tasks.build-container.results.IMAGE_URL)
290286
- name: IMAGE_DIGEST
@@ -394,28 +390,6 @@ spec:
394390
operator: in
395391
values:
396392
- "false"
397-
- name: sbom-json-check
398-
params:
399-
- name: IMAGE_URL
400-
value: $(tasks.build-container.results.IMAGE_URL)
401-
- name: IMAGE_DIGEST
402-
value: $(tasks.build-container.results.IMAGE_DIGEST)
403-
runAfter:
404-
- build-container
405-
taskRef:
406-
params:
407-
- name: name
408-
value: sbom-json-check
409-
- name: bundle
410-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
411-
- name: kind
412-
value: task
413-
resolver: bundles
414-
when:
415-
- input: $(params.skip-checks)
416-
operator: in
417-
values:
418-
- "false"
419393
- name: apply-tags
420394
params:
421395
- name: IMAGE

‎.tekton/cache-push.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ spec:
253253
params:
254254
- name: BINARY_IMAGE
255255
value: $(params.output-image)
256-
- name: BASE_IMAGES
257-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
258256
runAfter:
259257
- build-container
260258
taskRef:
@@ -280,8 +278,6 @@ spec:
280278
workspace: workspace
281279
- name: deprecated-base-image-check
282280
params:
283-
- name: BASE_IMAGES_DIGESTS
284-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
285281
- name: IMAGE_URL
286282
value: $(tasks.build-container.results.IMAGE_URL)
287283
- name: IMAGE_DIGEST
@@ -391,28 +387,6 @@ spec:
391387
operator: in
392388
values:
393389
- "false"
394-
- name: sbom-json-check
395-
params:
396-
- name: IMAGE_URL
397-
value: $(tasks.build-container.results.IMAGE_URL)
398-
- name: IMAGE_DIGEST
399-
value: $(tasks.build-container.results.IMAGE_DIGEST)
400-
runAfter:
401-
- build-container
402-
taskRef:
403-
params:
404-
- name: name
405-
value: sbom-json-check
406-
- name: bundle
407-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
408-
- name: kind
409-
value: task
410-
resolver: bundles
411-
when:
412-
- input: $(params.skip-checks)
413-
operator: in
414-
values:
415-
- "false"
416390
- name: apply-tags
417391
params:
418392
- name: IMAGE

‎.tekton/cli-pull-request.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ spec:
256256
params:
257257
- name: BINARY_IMAGE
258258
value: $(params.output-image)
259-
- name: BASE_IMAGES
260-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
261259
runAfter:
262260
- build-container
263261
taskRef:
@@ -283,8 +281,6 @@ spec:
283281
workspace: workspace
284282
- name: deprecated-base-image-check
285283
params:
286-
- name: BASE_IMAGES_DIGESTS
287-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
288284
- name: IMAGE_URL
289285
value: $(tasks.build-container.results.IMAGE_URL)
290286
- name: IMAGE_DIGEST
@@ -394,28 +390,6 @@ spec:
394390
operator: in
395391
values:
396392
- "false"
397-
- name: sbom-json-check
398-
params:
399-
- name: IMAGE_URL
400-
value: $(tasks.build-container.results.IMAGE_URL)
401-
- name: IMAGE_DIGEST
402-
value: $(tasks.build-container.results.IMAGE_DIGEST)
403-
runAfter:
404-
- build-container
405-
taskRef:
406-
params:
407-
- name: name
408-
value: sbom-json-check
409-
- name: bundle
410-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
411-
- name: kind
412-
value: task
413-
resolver: bundles
414-
when:
415-
- input: $(params.skip-checks)
416-
operator: in
417-
values:
418-
- "false"
419393
- name: apply-tags
420394
params:
421395
- name: IMAGE

‎.tekton/cli-push.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ spec:
253253
params:
254254
- name: BINARY_IMAGE
255255
value: $(params.output-image)
256-
- name: BASE_IMAGES
257-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
258256
runAfter:
259257
- build-container
260258
taskRef:
@@ -280,8 +278,6 @@ spec:
280278
workspace: workspace
281279
- name: deprecated-base-image-check
282280
params:
283-
- name: BASE_IMAGES_DIGESTS
284-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
285281
- name: IMAGE_URL
286282
value: $(tasks.build-container.results.IMAGE_URL)
287283
- name: IMAGE_DIGEST
@@ -391,28 +387,6 @@ spec:
391387
operator: in
392388
values:
393389
- "false"
394-
- name: sbom-json-check
395-
params:
396-
- name: IMAGE_URL
397-
value: $(tasks.build-container.results.IMAGE_URL)
398-
- name: IMAGE_DIGEST
399-
value: $(tasks.build-container.results.IMAGE_DIGEST)
400-
runAfter:
401-
- build-container
402-
taskRef:
403-
params:
404-
- name: name
405-
value: sbom-json-check
406-
- name: bundle
407-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
408-
- name: kind
409-
value: task
410-
resolver: bundles
411-
when:
412-
- input: $(params.skip-checks)
413-
operator: in
414-
values:
415-
- "false"
416390
- name: apply-tags
417391
params:
418392
- name: IMAGE

‎.tekton/controller-pull-request.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ spec:
254254
params:
255255
- name: BINARY_IMAGE
256256
value: $(params.output-image)
257-
- name: BASE_IMAGES
258-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
259257
runAfter:
260258
- build-container
261259
taskRef:
@@ -281,8 +279,6 @@ spec:
281279
workspace: workspace
282280
- name: deprecated-base-image-check
283281
params:
284-
- name: BASE_IMAGES_DIGESTS
285-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
286282
- name: IMAGE_URL
287283
value: $(tasks.build-container.results.IMAGE_URL)
288284
- name: IMAGE_DIGEST
@@ -392,28 +388,6 @@ spec:
392388
operator: in
393389
values:
394390
- "false"
395-
- name: sbom-json-check
396-
params:
397-
- name: IMAGE_URL
398-
value: $(tasks.build-container.results.IMAGE_URL)
399-
- name: IMAGE_DIGEST
400-
value: $(tasks.build-container.results.IMAGE_DIGEST)
401-
runAfter:
402-
- build-container
403-
taskRef:
404-
params:
405-
- name: name
406-
value: sbom-json-check
407-
- name: bundle
408-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
409-
- name: kind
410-
value: task
411-
resolver: bundles
412-
when:
413-
- input: $(params.skip-checks)
414-
operator: in
415-
values:
416-
- "false"
417391
- name: apply-tags
418392
params:
419393
- name: IMAGE

‎.tekton/controller-push.yaml

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,6 @@ spec:
251251
params:
252252
- name: BINARY_IMAGE
253253
value: $(params.output-image)
254-
- name: BASE_IMAGES
255-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
256254
runAfter:
257255
- build-container
258256
taskRef:
@@ -278,8 +276,6 @@ spec:
278276
workspace: workspace
279277
- name: deprecated-base-image-check
280278
params:
281-
- name: BASE_IMAGES_DIGESTS
282-
value: $(tasks.build-container.results.BASE_IMAGES_DIGESTS)
283279
- name: IMAGE_URL
284280
value: $(tasks.build-container.results.IMAGE_URL)
285281
- name: IMAGE_DIGEST
@@ -389,28 +385,6 @@ spec:
389385
operator: in
390386
values:
391387
- "false"
392-
- name: sbom-json-check
393-
params:
394-
- name: IMAGE_URL
395-
value: $(tasks.build-container.results.IMAGE_URL)
396-
- name: IMAGE_DIGEST
397-
value: $(tasks.build-container.results.IMAGE_DIGEST)
398-
runAfter:
399-
- build-container
400-
taskRef:
401-
params:
402-
- name: name
403-
value: sbom-json-check
404-
- name: bundle
405-
value: quay.io/konflux-ci/tekton-catalog/task-sbom-json-check:0.2@sha256:d4eee0cfef2069273752f6d27088b147ae6eac5f5db45e481efb4ae1a07883f6
406-
- name: kind
407-
value: task
408-
resolver: bundles
409-
when:
410-
- input: $(params.skip-checks)
411-
operator: in
412-
values:
413-
- "false"
414388
- name: apply-tags
415389
params:
416390
- name: IMAGE

0 commit comments

Comments
 (0)