Skip to content

Commit 775a989

Browse files
serverless-qeserverless-qe
andauthored
[release-v1.18] Update Konflux configurations (#1308)
* Generate dockerfiles with "./openshift/scripts/generate-dockerfiles.sh" * [release-v1.18] Sync Konflux configurations --------- Co-authored-by: serverless-qe <[email protected]>
1 parent 016d988 commit 775a989

File tree

6 files changed

+130
-123
lines changed

6 files changed

+130
-123
lines changed

.tekton/docker-build.yaml

Lines changed: 18 additions & 11 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:
@@ -522,7 +529,7 @@ spec:
522529
- name: name
523530
value: rpms-signature-scan
524531
- name: bundle
525-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
532+
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:7d1c087d7d33dd97effb3b4c9f3788e4c3138da2032040d69da6929e9a3aaceb
526533
- name: kind
527534
value: task
528535
resolver: bundles

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ 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.23
24+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ 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.23
23+
- GO_BUILDER=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24
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

openshift/ci-operator/build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
FROM registry.ci.openshift.org/ocp/4.17:cli-artifacts as tools
44

55
# Dockerfile to bootstrap build and test in openshift-ci
6-
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.19 as builder
6+
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20 as builder
77

88
ARG TARGETARCH
99

openshift/ci-operator/knative-images/func-util/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# DO NOT EDIT! Generated Dockerfile for cmd/func-util.
2-
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.19
2+
ARG GO_BUILDER=registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.24-openshift-4.20
33
ARG GO_RUNTIME=registry.access.redhat.com/ubi8/ubi-minimal
44

55
FROM $GO_BUILDER as builder

0 commit comments

Comments
 (0)