Skip to content

Commit 9f16a39

Browse files
author
serverless-qe
committed
[release-1.35] Sync Konflux configurations
1 parent 3592ae3 commit 9f16a39

File tree

3 files changed

+99
-80
lines changed

3 files changed

+99
-80
lines changed

.tekton/bundle-build.yaml

Lines changed: 71 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: generic
77
pipelines.openshift.io/strategy: docker
@@ -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
@@ -37,7 +41,8 @@ spec:
3741
name: build-source-image
3842
type: string
3943
- default: "false"
40-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
44+
description: 'Enable in-development package managers. WARNING: the behavior may
45+
change at any time without notice. Use at your own risk.'
4146
name: prefetch-input-dev-package-managers
4247
- default: []
4348
description: Additional image tags
@@ -54,11 +59,13 @@ spec:
5459
name: output-image
5560
type: string
5661
- default: .
57-
description: Path to the source code of an application's component from where to build image.
62+
description: Path to the source code of an application's component from where
63+
to build image.
5864
name: path-context
5965
type: string
6066
- default: Dockerfile
61-
description: Path to the Dockerfile inside the context specified by parameter path-context
67+
description: Path to the Dockerfile inside the context specified by parameter
68+
path-context
6269
name: dockerfile
6370
type: string
6471
- default: "false"
@@ -78,11 +85,9 @@ spec:
7885
name: prefetch-input
7986
type: string
8087
- default: ""
81-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
88+
description: Image tag expiration time, time values could be something like 1h,
89+
2d, 3w for hours, days, and weeks, respectively.
8290
name: image-expires-after
83-
- default: "true"
84-
description: Add built image into an OCI image index
85-
name: build-image-index
8691
type: string
8792
- default: []
8893
description: Array of --build-arg values ("arg=value" strings) for buildah
@@ -93,12 +98,14 @@ spec:
9398
name: build-args-file
9499
type: string
95100
- default: "false"
96-
description: Whether to enable privileged mode, should be used only with remote VMs
101+
description: Whether to enable privileged mode, should be used only with remote
102+
VMs
97103
name: privileged-nested
98104
type: string
99105
- default:
100106
- linux/x86_64
101-
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
107+
description: List of platforms to build the container images on. The available
108+
set of values is determined by the configuration of the multi-platform-controller.
102109
name: build-platforms
103110
type: array
104111
results:
@@ -115,6 +122,56 @@ spec:
115122
name: CHAINS-GIT_COMMIT
116123
value: $(tasks.clone-repository.results.commit)
117124
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:9e866d4d0489a6ab84ae263db416c9f86d2d6117ef4444f495a0e97388ae3ac0
167+
- name: kind
168+
value: task
169+
resolver: bundles
170+
when:
171+
- input: $(tasks.init.results.build)
172+
operator: in
173+
values:
174+
- "true"
118175
- name: sast-snyk-check
119176
params:
120177
- name: ARGS
@@ -236,56 +293,6 @@ spec:
236293
workspaces:
237294
- name: basic-auth
238295
workspace: git-auth
239-
- matrix:
240-
params:
241-
- name: PLATFORM
242-
value:
243-
- $(params.build-platforms)
244-
name: build-images
245-
params:
246-
- name: IMAGE
247-
value: $(params.output-image)
248-
- name: DOCKERFILE
249-
value: $(params.dockerfile)
250-
- name: CONTEXT
251-
value: $(params.path-context)
252-
- name: HERMETIC
253-
value: $(params.hermetic)
254-
- name: PREFETCH_INPUT
255-
value: $(params.prefetch-input)
256-
- name: IMAGE_EXPIRES_AFTER
257-
value: $(params.image-expires-after)
258-
- name: COMMIT_SHA
259-
value: $(tasks.clone-repository.results.commit)
260-
- name: BUILD_ARGS
261-
value:
262-
- $(params.build-args[*])
263-
- name: BUILD_ARGS_FILE
264-
value: $(params.build-args-file)
265-
- name: PRIVILEGED_NESTED
266-
value: $(params.privileged-nested)
267-
- name: SOURCE_ARTIFACT
268-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
269-
- name: CACHI2_ARTIFACT
270-
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
271-
- name: IMAGE_APPEND_PLATFORM
272-
value: "true"
273-
runAfter:
274-
- prefetch-dependencies
275-
taskRef:
276-
params:
277-
- name: name
278-
value: buildah-remote-oci-ta
279-
- name: bundle
280-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:9e866d4d0489a6ab84ae263db416c9f86d2d6117ef4444f495a0e97388ae3ac0
281-
- name: kind
282-
value: task
283-
resolver: bundles
284-
when:
285-
- input: $(tasks.init.results.build)
286-
operator: in
287-
values:
288-
- "true"
289296
- name: build-image-index
290297
params:
291298
- name: IMAGE
@@ -319,12 +326,12 @@ spec:
319326
params:
320327
- name: BINARY_IMAGE
321328
value: $(tasks.build-image-index.results.IMAGE_URL)
329+
- name: BINARY_IMAGE_DIGEST
330+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
322331
- name: SOURCE_ARTIFACT
323332
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
324333
- name: CACHI2_ARTIFACT
325334
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
326-
- name: BINARY_IMAGE_DIGEST
327-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
328335
runAfter:
329336
- build-image-index
330337
taskRef:
@@ -499,7 +506,7 @@ spec:
499506
- name: name
500507
value: rpms-signature-scan
501508
- name: bundle
502-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
509+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
503510
- name: kind
504511
value: task
505512
resolver: bundles

.tekton/docker-build.yaml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: generic
77
pipelines.openshift.io/strategy: docker
@@ -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
@@ -33,7 +33,8 @@ spec:
3333
- linux/arm64
3434
- linux/ppc64le
3535
- linux/s390x
36-
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
36+
description: List of platforms to build the container images on. The available
37+
set of values is determined by the configuration of the multi-platform-controller.
3738
name: build-platforms
3839
type: array
3940
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +46,8 @@ spec:
4546
name: build-source-image
4647
type: string
4748
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
49+
description: 'Enable in-development package managers. WARNING: the behavior may
50+
change at any time without notice. Use at your own risk.'
4951
name: prefetch-input-dev-package-managers
5052
- default: []
5153
description: Additional image tags
@@ -62,11 +64,13 @@ spec:
6264
name: output-image
6365
type: string
6466
- default: .
65-
description: Path to the source code of an application's component from where to build image.
67+
description: Path to the source code of an application's component from where
68+
to build image.
6669
name: path-context
6770
type: string
6871
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
72+
description: Path to the Dockerfile inside the context specified by parameter
73+
path-context
7074
name: dockerfile
7175
type: string
7276
- default: "false"
@@ -86,8 +90,10 @@ spec:
8690
name: prefetch-input
8791
type: string
8892
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
93+
description: Image tag expiration time, time values could be something like 1h,
94+
2d, 3w for hours, days, and weeks, respectively.
9095
name: image-expires-after
96+
type: string
9197
- default: "true"
9298
description: Add built image into an OCI image index
9399
name: build-image-index
@@ -101,7 +107,8 @@ spec:
101107
name: build-args-file
102108
type: string
103109
- default: "false"
104-
description: Whether to enable privileged mode, should be used only with remote VMs
110+
description: Whether to enable privileged mode, should be used only with remote
111+
VMs
105112
name: privileged-nested
106113
type: string
107114
results:
@@ -322,12 +329,12 @@ spec:
322329
params:
323330
- name: BINARY_IMAGE
324331
value: $(tasks.build-image-index.results.IMAGE_URL)
332+
- name: BINARY_IMAGE_DIGEST
333+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
325334
- name: SOURCE_ARTIFACT
326335
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
327336
- name: CACHI2_ARTIFACT
328337
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
329-
- name: BINARY_IMAGE_DIGEST
330-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
331338
runAfter:
332339
- build-image-index
333340
taskRef:
@@ -522,7 +529,7 @@ spec:
522529
- name: name
523530
value: rpms-signature-scan
524531
- name: bundle
525-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
532+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
526533
- name: kind
527534
value: task
528535
resolver: bundles

.tekton/fbc-builder.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
4+
creationTimestamp: null
55
labels:
66
pipelines.openshift.io/runtime: fbc
77
pipelines.openshift.io/strategy: fbc
@@ -33,7 +33,8 @@ spec:
3333
- linux/arm64
3434
- linux/ppc64le
3535
- linux/s390x
36-
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
36+
description: List of platforms to build the container images on. The available
37+
set of values is determined by the configuration of the multi-platform-controller.
3738
name: build-platforms
3839
type: array
3940
- default: "true"
@@ -55,11 +56,13 @@ spec:
5556
name: output-image
5657
type: string
5758
- default: .
58-
description: Path to the source code of an application's component from where to build image.
59+
description: Path to the source code of an application's component from where
60+
to build image.
5961
name: path-context
6062
type: string
6163
- default: Dockerfile
62-
description: Path to the Dockerfile inside the context specified by parameter path-context
64+
description: Path to the Dockerfile inside the context specified by parameter
65+
path-context
6366
name: dockerfile
6467
type: string
6568
- default: "false"
@@ -79,8 +82,10 @@ spec:
7982
name: prefetch-input
8083
type: string
8184
- default: ""
82-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
85+
description: Image tag expiration time, time values could be something like 1h,
86+
2d, 3w for hours, days, and weeks, respectively.
8387
name: image-expires-after
88+
type: string
8489
- default: "true"
8590
description: Add built image into an OCI image index
8691
name: build-image-index

0 commit comments

Comments
 (0)