Skip to content

Commit 2b6a1f0

Browse files
author
serverless-qe
committed
[release-v1.16] Sync Konflux configurations
1 parent 6cedb49 commit 2b6a1f0

File tree

2 files changed

+18
-8
lines changed

2 files changed

+18
-8
lines changed

.tekton/docker-build.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
description: |
1212
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
1313
14-
_Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://enterprisecontract.dev/docs/ec-policies/release_policy.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
14+
_Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
1515
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_
1616
finally:
1717
- name: show-sbom
@@ -93,6 +93,7 @@ spec:
9393
description: Image tag expiration time, time values could be something like 1h,
9494
2d, 3w for hours, days, and weeks, respectively.
9595
name: image-expires-after
96+
type: string
9697
- default: "true"
9798
description: Add built image into an OCI image index
9899
name: build-image-index
@@ -184,8 +185,10 @@ spec:
184185
params:
185186
- name: ADDITIONAL_TAGS
186187
value: $(params.additional-tags[*])
187-
- name: IMAGE
188+
- name: IMAGE_URL
188189
value: $(tasks.build-image-index.results.IMAGE_URL)
190+
- name: IMAGE_DIGEST
191+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
189192
runAfter:
190193
- build-image-index
191194
taskRef:
@@ -325,7 +328,9 @@ spec:
325328
- name: build-source-image
326329
params:
327330
- name: BINARY_IMAGE
328-
value: $(params.output-image)
331+
value: $(tasks.build-image-index.results.IMAGE_URL)
332+
- name: BINARY_IMAGE_DIGEST
333+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
329334
- name: SOURCE_ARTIFACT
330335
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
331336
- name: CACHI2_ARTIFACT
@@ -524,7 +529,7 @@ spec:
524529
- name: name
525530
value: rpms-signature-scan
526531
- name: bundle
527-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:ec7f6de651458e4a5842b145e761b0d86b03b52bec1515d6d8a1b8cf107af95c
532+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
528533
- name: kind
529534
value: task
530535
resolver: bundles

.tekton/docker-java-build.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
description: |
1212
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
1313
14-
_Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://enterprisecontract.dev/docs/ec-policies/release_policy.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
14+
_Uses `buildah` to create a multi-platform container image leveraging [trusted artifacts](https://konflux-ci.dev/architecture/ADR/0036-trusted-artifacts.html). It also optionally creates a source image and runs some build-time tests. This pipeline requires that the [multi platform controller](https://github.com/konflux-ci/multi-platform-controller) is deployed and configured on your Konflux instance. Information is shared between tasks using OCI artifacts instead of PVCs. EC will pass the [`trusted_task.trusted`](https://conforma.dev/docs/policy/packages/release_trusted_task.html#trusted_task__trusted) policy as long as all data used to build the artifact is generated from trusted tasks.
1515
This pipeline is pushed as a Tekton bundle to [quay.io](https://quay.io/repository/konflux-ci/tekton-catalog/pipeline-docker-build-multi-platform-oci-ta?tab=tags)_
1616
finally:
1717
- name: show-sbom
@@ -93,6 +93,7 @@ spec:
9393
description: Image tag expiration time, time values could be something like 1h,
9494
2d, 3w for hours, days, and weeks, respectively.
9595
name: image-expires-after
96+
type: string
9697
- default: "true"
9798
description: Add built image into an OCI image index
9899
name: build-image-index
@@ -312,8 +313,10 @@ spec:
312313
params:
313314
- name: ADDITIONAL_TAGS
314315
value: $(params.additional-tags[*])
315-
- name: IMAGE
316+
- name: IMAGE_URL
316317
value: $(tasks.build-image-index.results.IMAGE_URL)
318+
- name: IMAGE_DIGEST
319+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
317320
runAfter:
318321
- build-image-index
319322
taskRef:
@@ -403,7 +406,9 @@ spec:
403406
- name: build-source-image
404407
params:
405408
- name: BINARY_IMAGE
406-
value: $(params.output-image)
409+
value: $(tasks.build-image-index.results.IMAGE_URL)
410+
- name: BINARY_IMAGE_DIGEST
411+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
407412
- name: SOURCE_ARTIFACT
408413
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
409414
- name: CACHI2_ARTIFACT
@@ -602,7 +607,7 @@ spec:
602607
- name: name
603608
value: rpms-signature-scan
604609
- name: bundle
605-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:ec7f6de651458e4a5842b145e761b0d86b03b52bec1515d6d8a1b8cf107af95c
610+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
606611
- name: kind
607612
value: task
608613
resolver: bundles

0 commit comments

Comments
 (0)