Skip to content

Commit 820982c

Browse files
author
serverless-qe
committed
[release-1.36] Sync Konflux configurations
1 parent df0ac3f commit 820982c

File tree

3 files changed

+22
-9
lines changed

3 files changed

+22
-9
lines changed

.tekton/bundle-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
@@ -88,6 +88,7 @@ spec:
8888
description: Image tag expiration time, time values could be something like 1h,
8989
2d, 3w for hours, days, and weeks, respectively.
9090
name: image-expires-after
91+
type: string
9192
- default: []
9293
description: Array of --build-arg values ("arg=value" strings) for buildah
9394
name: build-args
@@ -231,8 +232,10 @@ spec:
231232
params:
232233
- name: ADDITIONAL_TAGS
233234
value: $(params.additional-tags[*])
234-
- name: IMAGE
235+
- name: IMAGE_URL
235236
value: $(tasks.build-image-index.results.IMAGE_URL)
237+
- name: IMAGE_DIGEST
238+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
236239
runAfter:
237240
- build-image-index
238241
taskRef:
@@ -322,7 +325,9 @@ spec:
322325
- name: build-source-image
323326
params:
324327
- name: BINARY_IMAGE
325-
value: $(params.output-image)
328+
value: $(tasks.build-image-index.results.IMAGE_URL)
329+
- name: BINARY_IMAGE_DIGEST
330+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
326331
- name: SOURCE_ARTIFACT
327332
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
328333
- name: CACHI2_ARTIFACT
@@ -501,7 +506,7 @@ spec:
501506
- name: name
502507
value: rpms-signature-scan
503508
- name: bundle
504-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:ec7f6de651458e4a5842b145e761b0d86b03b52bec1515d6d8a1b8cf107af95c
509+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
505510
- name: kind
506511
value: task
507512
resolver: bundles

.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/fbc-builder.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ spec:
8585
description: Image tag expiration time, time values could be something like 1h,
8686
2d, 3w for hours, days, and weeks, respectively.
8787
name: image-expires-after
88+
type: string
8889
- default: "true"
8990
description: Add built image into an OCI image index
9091
name: build-image-index
@@ -115,8 +116,10 @@ spec:
115116
params:
116117
- name: ADDITIONAL_TAGS
117118
value: $(params.additional-tags[*])
118-
- name: IMAGE
119+
- name: IMAGE_URL
119120
value: $(tasks.build-image-index.results.IMAGE_URL)
121+
- name: IMAGE_DIGEST
122+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
120123
runAfter:
121124
- build-image-index
122125
taskRef:

0 commit comments

Comments
 (0)