Skip to content

Commit 712e582

Browse files
serverless-qeserverless-qe
andauthored
[release-v1.18] Sync Konflux configurations (#2112)
Co-authored-by: serverless-qe <[email protected]>
1 parent bb6c996 commit 712e582

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

.tekton/docker-build.yaml

Lines changed: 13 additions & 15 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
@@ -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,7 +90,8 @@ 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
9196
type: string
9297
- default: "true"
@@ -102,13 +107,10 @@ spec:
102107
name: build-args-file
103108
type: string
104109
- default: "false"
105-
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
106112
name: privileged-nested
107113
type: string
108-
- name: buildah-format
109-
default: docker
110-
type: string
111-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112114
results:
113115
- description: ""
114116
name: IMAGE_URL
@@ -278,8 +280,6 @@ spec:
278280
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
279281
- name: IMAGE_APPEND_PLATFORM
280282
value: "true"
281-
- name: BUILDAH_FORMAT
282-
value: $(params.buildah-format)
283283
runAfter:
284284
- prefetch-dependencies
285285
taskRef:
@@ -309,8 +309,6 @@ spec:
309309
- name: IMAGES
310310
value:
311311
- $(tasks.build-images.results.IMAGE_REF[*])
312-
- name: BUILDAH_FORMAT
313-
value: $(params.buildah-format)
314312
runAfter:
315313
- build-images
316314
taskRef:

.tekton/docker-java-build.yaml

Lines changed: 13 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
@@ -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,7 +90,8 @@ 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
9196
type: string
9297
- default: "true"
@@ -102,13 +107,10 @@ spec:
102107
name: build-args-file
103108
type: string
104109
- default: "false"
105-
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
106112
name: privileged-nested
107113
type: string
108-
- name: buildah-format
109-
default: docker
110-
type: string
111-
description: The format for the resulting image's mediaType. Valid values are oci or docker.
112114
results:
113115
- description: ""
114116
name: IMAGE_URL

0 commit comments

Comments
 (0)