Skip to content

Commit 343e89d

Browse files
author
serverless-qe
committed
[release-v1.18] Sync Konflux configurations
1 parent cf51fc3 commit 343e89d

File tree

3 files changed

+53
-31
lines changed

3 files changed

+53
-31
lines changed

.tekton/docker-build.yaml

Lines changed: 39 additions & 19 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: null
54
labels:
65
pipelines.openshift.io/runtime: generic
76
pipelines.openshift.io/strategy: docker
@@ -13,20 +12,6 @@ spec:
1312
1413
_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:86c069cac0a669797e8049faa8aa4088e70ff7fcd579d5bdc37626a9e0488a05
27-
- name: kind
28-
value: task
29-
resolver: bundles
3015
params:
3116
- default:
3217
- linux/x86_64
@@ -86,7 +71,7 @@ spec:
8671
name: hermetic
8772
type: string
8873
- default: ""
89-
description: Build dependencies to be prefetched by Cachi2
74+
description: Build dependencies to be prefetched
9075
name: prefetch-input
9176
type: string
9277
- default: ""
@@ -98,6 +83,14 @@ spec:
9883
description: Add built image into an OCI image index
9984
name: build-image-index
10085
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
10194
- default: []
10295
description: Array of --build-arg values ("arg=value" strings) for buildah
10396
name: build-args
@@ -208,6 +201,8 @@ spec:
208201
value: $(params.rebuild)
209202
- name: skip-checks
210203
value: $(params.skip-checks)
204+
- name: enable-cache-proxy
205+
value: $(params.enable-cache-proxy)
211206
taskRef:
212207
params:
213208
- name: name
@@ -274,6 +269,14 @@ spec:
274269
value: $(params.build-args-file)
275270
- name: PRIVILEGED_NESTED
276271
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)
277280
- name: SOURCE_ARTIFACT
278281
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
279282
- name: CACHI2_ARTIFACT
@@ -309,6 +312,8 @@ spec:
309312
- name: IMAGES
310313
value:
311314
- $(tasks.build-images.results.IMAGE_REF[*])
315+
- name: BUILDAH_FORMAT
316+
value: $(params.buildah-format)
312317
runAfter:
313318
- build-images
314319
taskRef:
@@ -377,7 +382,12 @@ spec:
377382
operator: in
378383
values:
379384
- "false"
380-
- name: clair-scan
385+
- matrix:
386+
params:
387+
- name: image-platform
388+
value:
389+
- $(params.build-platforms)
390+
name: clair-scan
381391
params:
382392
- name: image-digest
383393
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -399,7 +409,12 @@ spec:
399409
operator: in
400410
values:
401411
- "false"
402-
- name: ecosystem-cert-preflight-checks
412+
- matrix:
413+
params:
414+
- name: platform
415+
value:
416+
- $(params.build-platforms)
417+
name: ecosystem-cert-preflight-checks
403418
params:
404419
- name: image-url
405420
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -419,7 +434,12 @@ spec:
419434
operator: in
420435
values:
421436
- "false"
422-
- name: clamav-scan
437+
- matrix:
438+
params:
439+
- name: image-arch
440+
value:
441+
- $(params.build-platforms)
442+
name: clamav-scan
423443
params:
424444
- name: image-digest
425445
value: $(tasks.build-image-index.results.IMAGE_DIGEST)

.tekton/kn-plugin-func-func-util-118-pull-request.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@ spec:
2121
value: openshift/ci-operator/knative-images/func-util/Dockerfile
2222
- name: build-args
2323
value:
24-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
25-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
26-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
27-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
28-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
29-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
24+
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
25+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
26+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
27+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
28+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
29+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
30+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
3031
- VERSION=1.38.0
3132
- name: git-url
3233
value: '{{source_url}}'

.tekton/kn-plugin-func-func-util-118-push.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ spec:
2020
value: openshift/ci-operator/knative-images/func-util/Dockerfile
2121
- name: build-args
2222
value:
23-
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
24-
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
25-
- JAVA_BUILDER=registry.access.redhat.com/ubi8/openjdk-21
26-
- JAVA_RUNTIME=registry.access.redhat.com/ubi8/openjdk-21-runtime
27-
- NODE_BUILDER=registry.access.redhat.com/ubi8/nodejs-20
28-
- NODE_RUNTIME=registry.access.redhat.com/ubi8/nodejs-20
23+
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts-rhel9:v4.16
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_golang_1.23
25+
- GO_RUNTIME=registry.access.redhat.com/ubi9/ubi-minimal
26+
- JAVA_BUILDER=registry.access.redhat.com/ubi9/openjdk-21
27+
- JAVA_RUNTIME=registry.access.redhat.com/ubi9/openjdk-21-runtime
28+
- NODE_BUILDER=registry.access.redhat.com/ubi9/nodejs-20
29+
- NODE_RUNTIME=registry.access.redhat.com/ubi9/nodejs-20
2930
- VERSION=1.38.0
3031
- name: git-url
3132
value: '{{source_url}}'

0 commit comments

Comments
 (0)