Skip to content

Commit 3843919

Browse files
author
serverless-qe
committed
[release-v1.15] Sync Konflux configurations
1 parent 4ec2745 commit 3843919

File tree

3 files changed

+55
-38
lines changed

3 files changed

+55
-38
lines changed

.tekton/docker-build.yaml

Lines changed: 52 additions & 35 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,11 +49,13 @@ 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
7261
- default: "false"
@@ -82,16 +71,26 @@ spec:
8271
name: hermetic
8372
type: string
8473
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
74+
description: Build dependencies to be prefetched
8675
name: prefetch-input
8776
type: string
8877
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
78+
description: Image tag expiration time, time values could be something like 1h,
79+
2d, 3w for hours, days, and weeks, respectively.
9080
name: image-expires-after
81+
type: string
9182
- default: "true"
9283
description: Add built image into an OCI image index
9384
name: build-image-index
9485
type: string
86+
- default: docker
87+
description: The format for the resulting image's mediaType. Valid values are
88+
oci or docker.
89+
name: buildah-format
90+
type: string
91+
- default: "false"
92+
description: Enable cache proxy configuration
93+
name: enable-cache-proxy
9594
- default: []
9695
description: Array of --build-arg values ("arg=value" strings) for buildah
9796
name: build-args
@@ -101,7 +100,8 @@ spec:
101100
name: build-args-file
102101
type: string
103102
- default: "false"
104-
description: Whether to enable privileged mode, should be used only with remote VMs
103+
description: Whether to enable privileged mode, should be used only with remote
104+
VMs
105105
name: privileged-nested
106106
type: string
107107
results:
@@ -201,6 +201,8 @@ spec:
201201
value: $(params.rebuild)
202202
- name: skip-checks
203203
value: $(params.skip-checks)
204+
- name: enable-cache-proxy
205+
value: $(params.enable-cache-proxy)
204206
taskRef:
205207
params:
206208
- name: name
@@ -267,6 +269,14 @@ spec:
267269
value: $(params.build-args-file)
268270
- name: PRIVILEGED_NESTED
269271
value: $(params.privileged-nested)
272+
- name: SOURCE_URL
273+
value: $(tasks.clone-repository.results.url)
274+
- name: BUILDAH_FORMAT
275+
value: $(params.buildah-format)
276+
- name: HTTP_PROXY
277+
value: $(tasks.init.results.http-proxy)
278+
- name: NO_PROXY
279+
value: $(tasks.init.results.no-proxy)
270280
- name: SOURCE_ARTIFACT
271281
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
272282
- name: CACHI2_ARTIFACT
@@ -302,6 +312,8 @@ spec:
302312
- name: IMAGES
303313
value:
304314
- $(tasks.build-images.results.IMAGE_REF[*])
315+
- name: BUILDAH_FORMAT
316+
value: $(params.buildah-format)
305317
runAfter:
306318
- build-images
307319
taskRef:
@@ -322,12 +334,12 @@ spec:
322334
params:
323335
- name: BINARY_IMAGE
324336
value: $(tasks.build-image-index.results.IMAGE_URL)
337+
- name: BINARY_IMAGE_DIGEST
338+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
325339
- name: SOURCE_ARTIFACT
326340
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
327341
- name: CACHI2_ARTIFACT
328342
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
329-
- name: BINARY_IMAGE_DIGEST
330-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
331343
runAfter:
332344
- build-image-index
333345
taskRef:
@@ -370,7 +382,12 @@ spec:
370382
operator: in
371383
values:
372384
- "false"
373-
- name: clair-scan
385+
- matrix:
386+
params:
387+
- name: image-platform
388+
value:
389+
- $(params.build-platforms)
390+
name: clair-scan
374391
params:
375392
- name: image-digest
376393
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -392,7 +409,12 @@ spec:
392409
operator: in
393410
values:
394411
- "false"
395-
- name: ecosystem-cert-preflight-checks
412+
- matrix:
413+
params:
414+
- name: platform
415+
value:
416+
- $(params.build-platforms)
417+
name: ecosystem-cert-preflight-checks
396418
params:
397419
- name: image-url
398420
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -412,12 +434,12 @@ spec:
412434
operator: in
413435
values:
414436
- "false"
415-
matrix:
437+
- matrix:
416438
params:
417-
- name: platform
439+
- name: image-arch
418440
value:
419441
- $(params.build-platforms)
420-
- name: clamav-scan
442+
name: clamav-scan
421443
params:
422444
- name: image-digest
423445
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -439,11 +461,6 @@ spec:
439461
operator: in
440462
values:
441463
- "false"
442-
matrix:
443-
params:
444-
- name: image-arch
445-
value:
446-
- $(params.build-platforms)
447464
- name: sast-shell-check
448465
params:
449466
- name: image-digest

.tekton/kn-plugin-func-func-util-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-func-func-util-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: '[{"type":"rpm"},{"path":".","type":"gomod"}]'

0 commit comments

Comments
 (0)