Skip to content

Commit 887d990

Browse files
author
serverless-qe
committed
[release-1.15] Sync Konflux configurations
1 parent eb7352e commit 887d990

7 files changed

+61
-73
lines changed

.tekton/docker-build.yaml

Lines changed: 52 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
apiVersion: tekton.dev/v1
22
kind: Pipeline
33
metadata:
4-
creationTimestamp:
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -11,29 +10,16 @@ spec:
1110
description: |
1211
This pipeline is ideal for building multi-arch container images from a Containerfile while maintaining trust after pipeline customization.
1312
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.
13+
_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.
1514
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)_
16-
finally:
17-
- name: show-sbom
18-
params:
19-
- name: IMAGE_URL
20-
value: $(tasks.build-image-index.results.IMAGE_URL)
21-
taskRef:
22-
params:
23-
- name: name
24-
value: show-sbom
25-
- name: bundle
26-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:beb0616db051952b4b861dd8c3e00fa1c0eccbd926feddf71194d3bb3ace9ce7
27-
- name: kind
28-
value: task
29-
resolver: bundles
3015
params:
3116
- default:
3217
- linux/x86_64
3318
- linux/arm64
3419
- linux/ppc64le
3520
- 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.
21+
description: List of platforms to build the container images on. The available
22+
set of values is determined by the configuration of the multi-platform-controller.
3723
name: build-platforms
3824
type: array
3925
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +31,8 @@ spec:
4531
name: build-source-image
4632
type: string
4733
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
34+
description: 'Enable in-development package managers. WARNING: the behavior may
35+
change at any time without notice. Use at your own risk.'
4936
name: prefetch-input-dev-package-managers
5037
- default: []
5138
description: Additional image tags
@@ -62,17 +49,15 @@ spec:
6249
name: output-image
6350
type: string
6451
- default: .
65-
description: Path to the source code of an application's component from where to build image.
52+
description: Path to the source code of an application's component from where
53+
to build image.
6654
name: path-context
6755
type: string
6856
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
57+
description: Path to the Dockerfile inside the context specified by parameter
58+
path-context
7059
name: dockerfile
7160
type: string
72-
- default: "false"
73-
description: Force rebuild image
74-
name: rebuild
75-
type: string
7661
- default: "false"
7762
description: Skip checks against built image
7863
name: skip-checks
@@ -82,16 +67,26 @@ spec:
8267
name: hermetic
8368
type: string
8469
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
70+
description: Build dependencies to be prefetched
8671
name: prefetch-input
8772
type: string
8873
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
74+
description: Image tag expiration time, time values could be something like 1h,
75+
2d, 3w for hours, days, and weeks, respectively.
9076
name: image-expires-after
77+
type: string
9178
- default: "true"
9279
description: Add built image into an OCI image index
9380
name: build-image-index
9481
type: string
82+
- default: docker
83+
description: The format for the resulting image's mediaType. Valid values are
84+
oci or docker.
85+
name: buildah-format
86+
type: string
87+
- default: "false"
88+
description: Enable cache proxy configuration
89+
name: enable-cache-proxy
9590
- default: []
9691
description: Array of --build-arg values ("arg=value" strings) for buildah
9792
name: build-args
@@ -101,7 +96,8 @@ spec:
10196
name: build-args-file
10297
type: string
10398
- default: "false"
104-
description: Whether to enable privileged mode, should be used only with remote VMs
99+
description: Whether to enable privileged mode, should be used only with remote
100+
VMs
105101
name: privileged-nested
106102
type: string
107103
results:
@@ -195,12 +191,8 @@ spec:
195191
resolver: bundles
196192
- name: init
197193
params:
198-
- name: image-url
199-
value: $(params.output-image)
200-
- name: rebuild
201-
value: $(params.rebuild)
202-
- name: skip-checks
203-
value: $(params.skip-checks)
194+
- name: enable-cache-proxy
195+
value: $(params.enable-cache-proxy)
204196
taskRef:
205197
params:
206198
- name: name
@@ -231,11 +223,6 @@ spec:
231223
- name: kind
232224
value: task
233225
resolver: bundles
234-
when:
235-
- input: $(tasks.init.results.build)
236-
operator: in
237-
values:
238-
- "true"
239226
workspaces:
240227
- name: basic-auth
241228
workspace: git-auth
@@ -267,6 +254,14 @@ spec:
267254
value: $(params.build-args-file)
268255
- name: PRIVILEGED_NESTED
269256
value: $(params.privileged-nested)
257+
- name: SOURCE_URL
258+
value: $(tasks.clone-repository.results.url)
259+
- name: BUILDAH_FORMAT
260+
value: $(params.buildah-format)
261+
- name: HTTP_PROXY
262+
value: $(tasks.init.results.http-proxy)
263+
- name: NO_PROXY
264+
value: $(tasks.init.results.no-proxy)
270265
- name: SOURCE_ARTIFACT
271266
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
272267
- name: CACHI2_ARTIFACT
@@ -284,11 +279,6 @@ spec:
284279
- name: kind
285280
value: task
286281
resolver: bundles
287-
when:
288-
- input: $(tasks.init.results.build)
289-
operator: in
290-
values:
291-
- "true"
292282
- name: build-image-index
293283
params:
294284
- name: IMAGE
@@ -302,6 +292,8 @@ spec:
302292
- name: IMAGES
303293
value:
304294
- $(tasks.build-images.results.IMAGE_REF[*])
295+
- name: BUILDAH_FORMAT
296+
value: $(params.buildah-format)
305297
runAfter:
306298
- build-images
307299
taskRef:
@@ -313,21 +305,16 @@ spec:
313305
- name: kind
314306
value: task
315307
resolver: bundles
316-
when:
317-
- input: $(tasks.init.results.build)
318-
operator: in
319-
values:
320-
- "true"
321308
- name: build-source-image
322309
params:
323310
- name: BINARY_IMAGE
324311
value: $(tasks.build-image-index.results.IMAGE_URL)
312+
- name: BINARY_IMAGE_DIGEST
313+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
325314
- name: SOURCE_ARTIFACT
326315
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
327316
- name: CACHI2_ARTIFACT
328317
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
329-
- name: BINARY_IMAGE_DIGEST
330-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
331318
runAfter:
332319
- build-image-index
333320
taskRef:
@@ -340,10 +327,6 @@ spec:
340327
value: task
341328
resolver: bundles
342329
when:
343-
- input: $(tasks.init.results.build)
344-
operator: in
345-
values:
346-
- "true"
347330
- input: $(params.build-source-image)
348331
operator: in
349332
values:
@@ -370,7 +353,12 @@ spec:
370353
operator: in
371354
values:
372355
- "false"
373-
- name: clair-scan
356+
- matrix:
357+
params:
358+
- name: image-platform
359+
value:
360+
- $(params.build-platforms)
361+
name: clair-scan
374362
params:
375363
- name: image-digest
376364
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -392,7 +380,12 @@ spec:
392380
operator: in
393381
values:
394382
- "false"
395-
- name: ecosystem-cert-preflight-checks
383+
- matrix:
384+
params:
385+
- name: platform
386+
value:
387+
- $(params.build-platforms)
388+
name: ecosystem-cert-preflight-checks
396389
params:
397390
- name: image-url
398391
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -412,12 +405,12 @@ spec:
412405
operator: in
413406
values:
414407
- "false"
415-
matrix:
408+
- matrix:
416409
params:
417-
- name: platform
410+
- name: image-arch
418411
value:
419412
- $(params.build-platforms)
420-
- name: clamav-scan
413+
name: clamav-scan
421414
params:
422415
- name: image-digest
423416
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -439,11 +432,6 @@ spec:
439432
operator: in
440433
values:
441434
- "false"
442-
matrix:
443-
params:
444-
- name: image-arch
445-
value:
446-
- $(params.build-platforms)
447435
- name: sast-shell-check
448436
params:
449437
- name: image-digest

.tekton/kn-plugin-event-sender-115-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2626
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2727
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- VERSION=1.35.1
28+
- VERSION=1.35.2
2929
- name: git-url
3030
value: '{{source_url}}'
3131
- name: hermetic

.tekton/kn-plugin-event-sender-115-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2525
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2626
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
27-
- VERSION=1.35.1
27+
- VERSION=1.35.2
2828
- name: git-url
2929
value: '{{source_url}}'
3030
- name: hermetic
@@ -36,7 +36,7 @@ spec:
3636
- name: additional-tags
3737
value:
3838
- $(context.pipelineRun.uid)-{{revision}}
39-
- 1.35.1
39+
- 1.35.2
4040
- latest
4141
- name: prefetch-input
4242
value: '[{"path":".","type":"gomod"}]'

.tekton/kn-plugin-event-test-eventshub-115-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2626
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2727
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- VERSION=1.35.1
28+
- VERSION=1.35.2
2929
- name: git-url
3030
value: '{{source_url}}'
3131
- name: hermetic

.tekton/kn-plugin-event-test-eventshub-115-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2525
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2626
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
27-
- VERSION=1.35.1
27+
- VERSION=1.35.2
2828
- name: git-url
2929
value: '{{source_url}}'
3030
- name: hermetic
@@ -36,7 +36,7 @@ spec:
3636
- name: additional-tags
3737
value:
3838
- $(context.pipelineRun.uid)-{{revision}}
39-
- 1.35.1
39+
- 1.35.2
4040
- latest
4141
- name: prefetch-input
4242
value: '[{"path":".","type":"gomod"}]'

.tekton/kn-plugin-event-test-wathola-forwarder-115-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2626
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2727
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- VERSION=1.35.1
28+
- VERSION=1.35.2
2929
- name: git-url
3030
value: '{{source_url}}'
3131
- name: hermetic

.tekton/kn-plugin-event-test-wathola-forwarder-115-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
2525
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
2626
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
27-
- VERSION=1.35.1
27+
- VERSION=1.35.2
2828
- name: git-url
2929
value: '{{source_url}}'
3030
- name: hermetic
@@ -36,7 +36,7 @@ spec:
3636
- name: additional-tags
3737
value:
3838
- $(context.pipelineRun.uid)-{{revision}}
39-
- 1.35.1
39+
- 1.35.2
4040
- latest
4141
- name: prefetch-input
4242
value: '[{"path":".","type":"gomod"}]'

0 commit comments

Comments
 (0)