Skip to content

Commit a19e045

Browse files
author
serverless-qe
committed
[release-1.35] Sync Konflux configurations
1 parent 8fcf044 commit a19e045

File tree

3 files changed

+75
-62
lines changed

3 files changed

+75
-62
lines changed

.tekton/bundle-build.yaml

Lines changed: 62 additions & 57 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
@@ -28,6 +28,10 @@ spec:
2828
value: task
2929
resolver: bundles
3030
params:
31+
- default: "false"
32+
description: Add built image into an OCI image index
33+
name: build-image-index
34+
type: string
3135
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
3236
description: Append arguments to Snyk code command.
3337
name: snyk-args
@@ -84,9 +88,6 @@ spec:
8488
description: Image tag expiration time, time values could be something like 1h,
8589
2d, 3w for hours, days, and weeks, respectively.
8690
name: image-expires-after
87-
- default: "true"
88-
description: Add built image into an OCI image index
89-
name: build-image-index
9091
type: string
9192
- default: []
9293
description: Array of --build-arg values ("arg=value" strings) for buildah
@@ -121,6 +122,56 @@ spec:
121122
name: CHAINS-GIT_COMMIT
122123
value: $(tasks.clone-repository.results.commit)
123124
tasks:
125+
- matrix:
126+
params:
127+
- name: PLATFORM
128+
value:
129+
- $(params.build-platforms)
130+
name: build-images
131+
params:
132+
- name: IMAGE_APPEND_PLATFORM
133+
value: "false"
134+
- name: IMAGE
135+
value: $(params.output-image)
136+
- name: DOCKERFILE
137+
value: $(params.dockerfile)
138+
- name: CONTEXT
139+
value: $(params.path-context)
140+
- name: HERMETIC
141+
value: $(params.hermetic)
142+
- name: PREFETCH_INPUT
143+
value: $(params.prefetch-input)
144+
- name: IMAGE_EXPIRES_AFTER
145+
value: $(params.image-expires-after)
146+
- name: COMMIT_SHA
147+
value: $(tasks.clone-repository.results.commit)
148+
- name: BUILD_ARGS
149+
value:
150+
- $(params.build-args[*])
151+
- name: BUILD_ARGS_FILE
152+
value: $(params.build-args-file)
153+
- name: PRIVILEGED_NESTED
154+
value: $(params.privileged-nested)
155+
- name: SOURCE_ARTIFACT
156+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
157+
- name: CACHI2_ARTIFACT
158+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
159+
runAfter:
160+
- prefetch-dependencies
161+
taskRef:
162+
params:
163+
- name: name
164+
value: buildah-remote-oci-ta
165+
- name: bundle
166+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:3141de71b1b98725e37c15c4287b8aa10008b755403a6d2518b85c6f19194fcc
167+
- name: kind
168+
value: task
169+
resolver: bundles
170+
when:
171+
- input: $(tasks.init.results.build)
172+
operator: in
173+
values:
174+
- "true"
124175
- name: sast-snyk-check
125176
params:
126177
- name: ARGS
@@ -181,8 +232,10 @@ spec:
181232
params:
182233
- name: ADDITIONAL_TAGS
183234
value: $(params.additional-tags[*])
184-
- name: IMAGE
235+
- name: IMAGE_URL
185236
value: $(tasks.build-image-index.results.IMAGE_URL)
237+
- name: IMAGE_DIGEST
238+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
186239
runAfter:
187240
- build-image-index
188241
taskRef:
@@ -240,56 +293,6 @@ spec:
240293
workspaces:
241294
- name: basic-auth
242295
workspace: git-auth
243-
- matrix:
244-
params:
245-
- name: PLATFORM
246-
value:
247-
- $(params.build-platforms)
248-
name: build-images
249-
params:
250-
- name: IMAGE
251-
value: $(params.output-image)
252-
- name: DOCKERFILE
253-
value: $(params.dockerfile)
254-
- name: CONTEXT
255-
value: $(params.path-context)
256-
- name: HERMETIC
257-
value: $(params.hermetic)
258-
- name: PREFETCH_INPUT
259-
value: $(params.prefetch-input)
260-
- name: IMAGE_EXPIRES_AFTER
261-
value: $(params.image-expires-after)
262-
- name: COMMIT_SHA
263-
value: $(tasks.clone-repository.results.commit)
264-
- name: BUILD_ARGS
265-
value:
266-
- $(params.build-args[*])
267-
- name: BUILD_ARGS_FILE
268-
value: $(params.build-args-file)
269-
- name: PRIVILEGED_NESTED
270-
value: $(params.privileged-nested)
271-
- name: SOURCE_ARTIFACT
272-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
273-
- name: CACHI2_ARTIFACT
274-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
275-
- name: IMAGE_APPEND_PLATFORM
276-
value: "true"
277-
runAfter:
278-
- prefetch-dependencies
279-
taskRef:
280-
params:
281-
- name: name
282-
value: buildah-remote-oci-ta
283-
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:3141de71b1b98725e37c15c4287b8aa10008b755403a6d2518b85c6f19194fcc
285-
- name: kind
286-
value: task
287-
resolver: bundles
288-
when:
289-
- input: $(tasks.init.results.build)
290-
operator: in
291-
values:
292-
- "true"
293296
- name: build-image-index
294297
params:
295298
- name: IMAGE
@@ -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:d01508e7a0df9059af2ef455e3e81588a70e0b24cd4a5def35af3cc1537bf84a
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:d01508e7a0df9059af2ef455e3e81588a70e0b24cd4a5def35af3cc1537bf84a
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)