Skip to content

Commit c8f3bf7

Browse files
author
serverless-qe
committed
[release-1.36] Sync Konflux configurations
1 parent be18a06 commit c8f3bf7

27 files changed

+91
-77
lines changed

.tekton/bundle-build.yaml

Lines changed: 24 additions & 17 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
@@ -41,7 +41,8 @@ spec:
4141
name: build-source-image
4242
type: string
4343
- default: "false"
44-
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.'
4546
name: prefetch-input-dev-package-managers
4647
- default: []
4748
description: Additional image tags
@@ -58,11 +59,13 @@ spec:
5859
name: output-image
5960
type: string
6061
- default: .
61-
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.
6264
name: path-context
6365
type: string
6466
- default: Dockerfile
65-
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
6669
name: dockerfile
6770
type: string
6871
- default: "false"
@@ -82,8 +85,10 @@ spec:
8285
name: prefetch-input
8386
type: string
8487
- default: ""
85-
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.
8690
name: image-expires-after
91+
type: string
8792
- default: []
8893
description: Array of --build-arg values ("arg=value" strings) for buildah
8994
name: build-args
@@ -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:
@@ -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:
@@ -389,7 +396,12 @@ spec:
389396
operator: in
390397
values:
391398
- "false"
392-
- name: clamav-scan
399+
- matrix:
400+
params:
401+
- name: image-arch
402+
value:
403+
- $(params.build-platforms)
404+
name: clamav-scan
393405
params:
394406
- name: image-digest
395407
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -411,11 +423,6 @@ spec:
411423
operator: in
412424
values:
413425
- "false"
414-
matrix:
415-
params:
416-
- name: image-arch
417-
value:
418-
- $(params.build-platforms)
419426
- name: sast-shell-check
420427
params:
421428
- name: image-digest
@@ -504,7 +511,7 @@ spec:
504511
- name: name
505512
value: rpms-signature-scan
506513
- name: bundle
507-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
514+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
508515
- name: kind
509516
value: task
510517
resolver: bundles

.tekton/docker-build.yaml

Lines changed: 21 additions & 19 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:
@@ -412,12 +419,12 @@ spec:
412419
operator: in
413420
values:
414421
- "false"
415-
matrix:
422+
- matrix:
416423
params:
417-
- name: platform
424+
- name: image-arch
418425
value:
419426
- $(params.build-platforms)
420-
- name: clamav-scan
427+
name: clamav-scan
421428
params:
422429
- name: image-digest
423430
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -439,11 +446,6 @@ spec:
439446
operator: in
440447
values:
441448
- "false"
442-
matrix:
443-
params:
444-
- name: image-arch
445-
value:
446-
- $(params.build-platforms)
447449
- name: sast-shell-check
448450
params:
449451
- name: image-digest
@@ -532,7 +534,7 @@ spec:
532534
- name: name
533535
value: rpms-signature-scan
534536
- name: bundle
535-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
537+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
536538
- name: kind
537539
value: task
538540
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

.tekton/serverless-bundle-136-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
value: olm-catalog/serverless-operator/Dockerfile
2222
- name: build-args
2323
value:
24-
- VERSION=1.36.0
24+
- VERSION=1.36.1
2525
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2626
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2727
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-bundle-136-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
value: olm-catalog/serverless-operator/Dockerfile
2121
- name: build-args
2222
value:
23-
- VERSION=1.36.0
23+
- VERSION=1.36.1
2424
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2525
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2626
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
@@ -39,7 +39,7 @@ spec:
3939
- name: additional-tags
4040
value:
4141
- $(context.pipelineRun.uid)-{{revision}}
42-
- 1.36.0
42+
- 1.36.1
4343
- latest
4444
- name: prefetch-input
4545
value: '[{"type":"rpm"}]'

.tekton/serverless-index-136-fbc-414-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.14
2424
- name: build-args
2525
value:
26-
- VERSION=1.36.0
26+
- VERSION=1.36.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-136-fbc-414-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
value: ./olm-catalog/serverless-operator-index/v4.14
2323
- name: build-args
2424
value:
25-
- VERSION=1.36.0
25+
- VERSION=1.36.1
2626
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2727
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2828
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
@@ -42,7 +42,7 @@ spec:
4242
- name: additional-tags
4343
value:
4444
- $(context.pipelineRun.uid)-{{revision}}
45-
- 1.36.0
45+
- 1.36.1
4646
- latest
4747
pipelineRef:
4848
name: fbc-builder

.tekton/serverless-index-136-fbc-415-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.15
2424
- name: build-args
2525
value:
26-
- VERSION=1.36.0
26+
- VERSION=1.36.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

.tekton/serverless-index-136-fbc-415-push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
value: ./olm-catalog/serverless-operator-index/v4.15
2323
- name: build-args
2424
value:
25-
- VERSION=1.36.0
25+
- VERSION=1.36.1
2626
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2727
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2828
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
@@ -42,7 +42,7 @@ spec:
4242
- name: additional-tags
4343
value:
4444
- $(context.pipelineRun.uid)-{{revision}}
45-
- 1.36.0
45+
- 1.36.1
4646
- latest
4747
pipelineRef:
4848
name: fbc-builder

.tekton/serverless-index-136-fbc-416-pull-request.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
value: ./olm-catalog/serverless-operator-index/v4.16
2424
- name: build-args
2525
value:
26-
- VERSION=1.36.0
26+
- VERSION=1.36.1
2727
- CLI_ARTIFACTS=registry.redhat.io/openshift4/ose-cli-artifacts:v4.14
2828
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23
2929
- GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal

0 commit comments

Comments
 (0)