Skip to content

Commit f39d964

Browse files
author
serverless-qe
committed
[release-v1.15] Sync Konflux configurations
1 parent 7523c58 commit f39d964

File tree

3 files changed

+48
-39
lines changed

3 files changed

+48
-39
lines changed

.tekton/docker-build.yaml

Lines changed: 45 additions & 36 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,29 +11,16 @@ 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)_
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
3016
params:
3117
- default:
3218
- linux/x86_64
3319
- linux/arm64
3420
- linux/ppc64le
3521
- 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.
22+
description: List of platforms to build the container images on. The available
23+
set of values is determined by the configuration of the multi-platform-controller.
3724
name: build-platforms
3825
type: array
3926
- default: --all-projects --org=3e1a4cca-ebfb-495f-b64c-3cc960d566b4 --exclude=test*,vendor,third_party
@@ -45,7 +32,8 @@ spec:
4532
name: build-source-image
4633
type: string
4734
- default: "false"
48-
description: 'Enable in-development package managers. WARNING: the behavior may change at any time without notice. Use at your own risk.'
35+
description: 'Enable in-development package managers. WARNING: the behavior may
36+
change at any time without notice. Use at your own risk.'
4937
name: prefetch-input-dev-package-managers
5038
- default: []
5139
description: Additional image tags
@@ -62,11 +50,13 @@ spec:
6250
name: output-image
6351
type: string
6452
- default: .
65-
description: Path to the source code of an application's component from where to build image.
53+
description: Path to the source code of an application's component from where
54+
to build image.
6655
name: path-context
6756
type: string
6857
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter path-context
58+
description: Path to the Dockerfile inside the context specified by parameter
59+
path-context
7060
name: dockerfile
7161
type: string
7262
- default: "false"
@@ -82,16 +72,23 @@ spec:
8272
name: hermetic
8373
type: string
8474
- default: ""
85-
description: Build dependencies to be prefetched by Cachi2
75+
description: Build dependencies to be prefetched
8676
name: prefetch-input
8777
type: string
8878
- default: ""
89-
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
79+
description: Image tag expiration time, time values could be something like 1h,
80+
2d, 3w for hours, days, and weeks, respectively.
9081
name: image-expires-after
82+
type: string
9183
- default: "true"
9284
description: Add built image into an OCI image index
9385
name: build-image-index
9486
type: string
87+
- default: docker
88+
description: The format for the resulting image's mediaType. Valid values are
89+
oci or docker.
90+
name: buildah-format
91+
type: string
9592
- default: []
9693
description: Array of --build-arg values ("arg=value" strings) for buildah
9794
name: build-args
@@ -101,7 +98,8 @@ spec:
10198
name: build-args-file
10299
type: string
103100
- default: "false"
104-
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
105103
name: privileged-nested
106104
type: string
107105
results:
@@ -267,6 +265,10 @@ spec:
267265
value: $(params.build-args-file)
268266
- name: PRIVILEGED_NESTED
269267
value: $(params.privileged-nested)
268+
- name: SOURCE_URL
269+
value: $(tasks.clone-repository.results.url)
270+
- name: BUILDAH_FORMAT
271+
value: $(params.buildah-format)
270272
- name: SOURCE_ARTIFACT
271273
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
272274
- name: CACHI2_ARTIFACT
@@ -302,6 +304,8 @@ spec:
302304
- name: IMAGES
303305
value:
304306
- $(tasks.build-images.results.IMAGE_REF[*])
307+
- name: BUILDAH_FORMAT
308+
value: $(params.buildah-format)
305309
runAfter:
306310
- build-images
307311
taskRef:
@@ -322,12 +326,12 @@ spec:
322326
params:
323327
- name: BINARY_IMAGE
324328
value: $(tasks.build-image-index.results.IMAGE_URL)
329+
- name: BINARY_IMAGE_DIGEST
330+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
325331
- name: SOURCE_ARTIFACT
326332
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
327333
- name: CACHI2_ARTIFACT
328334
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
329-
- name: BINARY_IMAGE_DIGEST
330-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
331335
runAfter:
332336
- build-image-index
333337
taskRef:
@@ -370,7 +374,12 @@ spec:
370374
operator: in
371375
values:
372376
- "false"
373-
- name: clair-scan
377+
- matrix:
378+
params:
379+
- name: image-platform
380+
value:
381+
- $(params.build-platforms)
382+
name: clair-scan
374383
params:
375384
- name: image-digest
376385
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -392,7 +401,12 @@ spec:
392401
operator: in
393402
values:
394403
- "false"
395-
- name: ecosystem-cert-preflight-checks
404+
- matrix:
405+
params:
406+
- name: platform
407+
value:
408+
- $(params.build-platforms)
409+
name: ecosystem-cert-preflight-checks
396410
params:
397411
- name: image-url
398412
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -412,12 +426,12 @@ spec:
412426
operator: in
413427
values:
414428
- "false"
415-
matrix:
429+
- matrix:
416430
params:
417-
- name: platform
431+
- name: image-arch
418432
value:
419433
- $(params.build-platforms)
420-
- name: clamav-scan
434+
name: clamav-scan
421435
params:
422436
- name: image-digest
423437
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -439,11 +453,6 @@ spec:
439453
operator: in
440454
values:
441455
- "false"
442-
matrix:
443-
params:
444-
- name: image-arch
445-
value:
446-
- $(params.build-platforms)
447456
- name: sast-shell-check
448457
params:
449458
- name: image-digest
@@ -532,7 +541,7 @@ spec:
532541
- name: name
533542
value: rpms-signature-scan
534543
- name: bundle
535-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
544+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:06977232e67509e5540528ff6c3b081b23fc5bf3e40fb3e2d09a086d5c3243fc
536545
- name: kind
537546
value: task
538547
resolver: bundles

.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)