Skip to content

Commit 90df544

Browse files
Merge pull request #414 from openshift/konflux/references/master
chore(deps): update konflux references
2 parents 40439b7 + 7562811 commit 90df544

4 files changed

+76
-60
lines changed

.tekton/managed-cluster-validating-webhooks-e2e-pull-request.yaml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
1111
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "master"
12-
creationTimestamp: null
12+
creationTimestamp:
1313
labels:
1414
appstudio.openshift.io/application: managed-cluster-validating-webhooks
1515
appstudio.openshift.io/component: managed-cluster-validating-webhooks-e2e
@@ -61,13 +61,11 @@ spec:
6161
name: output-image
6262
type: string
6363
- default: .
64-
description: Path to the source code of an application's component from where
65-
to build image.
64+
description: Path to the source code of an application's component from where to build image.
6665
name: path-context
6766
type: string
6867
- default: Dockerfile
69-
description: Path to the Dockerfile inside the context specified by parameter
70-
path-context
68+
description: Path to the Dockerfile inside the context specified by parameter path-context
7169
name: dockerfile
7270
type: string
7371
- default: "false"
@@ -87,8 +85,7 @@ spec:
8785
name: prefetch-input
8886
type: string
8987
- default: ""
90-
description: Image tag expiration time, time values could be something like
91-
1h, 2d, 3w for hours, days, and weeks, respectively.
88+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9289
name: image-expires-after
9390
type: string
9491
- default: "false"
@@ -108,10 +105,13 @@ spec:
108105
name: build-args-file
109106
type: string
110107
- default: "false"
111-
description: Whether to enable privileged mode, should be used only with remote
112-
VMs
108+
description: Whether to enable privileged mode, should be used only with remote VMs
113109
name: privileged-nested
114110
type: string
111+
- name: buildah-format
112+
default: docker
113+
type: string
114+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
115115
results:
116116
- description: ""
117117
name: IMAGE_URL
@@ -139,7 +139,7 @@ spec:
139139
- name: name
140140
value: init
141141
- name: bundle
142-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
142+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
143143
- name: kind
144144
value: task
145145
resolver: bundles
@@ -189,7 +189,7 @@ spec:
189189
- name: name
190190
value: prefetch-dependencies-oci-ta
191191
- name: bundle
192-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
192+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
193193
- name: kind
194194
value: task
195195
resolver: bundles
@@ -225,14 +225,16 @@ spec:
225225
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
226226
- name: CACHI2_ARTIFACT
227227
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
228+
- name: BUILDAH_FORMAT
229+
value: $(params.buildah-format)
228230
runAfter:
229231
- prefetch-dependencies
230232
taskRef:
231233
params:
232234
- name: name
233235
value: buildah-oci-ta
234236
- name: bundle
235-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:203b7a3d8c04c1f3b5327db3f31a19647f8d46304e7ced1dd5dcbba19445ac10
237+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
236238
- name: kind
237239
value: task
238240
resolver: bundles
@@ -254,14 +256,16 @@ spec:
254256
- name: IMAGES
255257
value:
256258
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
259+
- name: BUILDAH_FORMAT
260+
value: $(params.buildah-format)
257261
runAfter:
258262
- build-container
259263
taskRef:
260264
params:
261265
- name: name
262266
value: build-image-index
263267
- name: bundle
264-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
268+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
265269
- name: kind
266270
value: task
267271
resolver: bundles
@@ -313,7 +317,7 @@ spec:
313317
- name: name
314318
value: deprecated-image-check
315319
- name: bundle
316-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
320+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
317321
- name: kind
318322
value: task
319323
resolver: bundles

.tekton/managed-cluster-validating-webhooks-e2e-push.yaml

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
pipelinesascode.tekton.dev/cancel-in-progress: "false"
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
1010
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "master"
11-
creationTimestamp: null
11+
creationTimestamp:
1212
labels:
1313
appstudio.openshift.io/application: managed-cluster-validating-webhooks
1414
appstudio.openshift.io/component: managed-cluster-validating-webhooks-e2e
@@ -58,13 +58,11 @@ spec:
5858
name: output-image
5959
type: string
6060
- default: .
61-
description: Path to the source code of an application's component from where
62-
to build image.
61+
description: Path to the source code of an application's component from where to build image.
6362
name: path-context
6463
type: string
6564
- default: Dockerfile
66-
description: Path to the Dockerfile inside the context specified by parameter
67-
path-context
65+
description: Path to the Dockerfile inside the context specified by parameter path-context
6866
name: dockerfile
6967
type: string
7068
- default: "false"
@@ -84,8 +82,7 @@ spec:
8482
name: prefetch-input
8583
type: string
8684
- default: ""
87-
description: Image tag expiration time, time values could be something like
88-
1h, 2d, 3w for hours, days, and weeks, respectively.
85+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
8986
name: image-expires-after
9087
type: string
9188
- default: "false"
@@ -105,10 +102,13 @@ spec:
105102
name: build-args-file
106103
type: string
107104
- default: "false"
108-
description: Whether to enable privileged mode, should be used only with remote
109-
VMs
105+
description: Whether to enable privileged mode, should be used only with remote VMs
110106
name: privileged-nested
111107
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.
112112
results:
113113
- description: ""
114114
name: IMAGE_URL
@@ -136,7 +136,7 @@ spec:
136136
- name: name
137137
value: init
138138
- name: bundle
139-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
139+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
140140
- name: kind
141141
value: task
142142
resolver: bundles
@@ -186,7 +186,7 @@ spec:
186186
- name: name
187187
value: prefetch-dependencies-oci-ta
188188
- name: bundle
189-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
189+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
190190
- name: kind
191191
value: task
192192
resolver: bundles
@@ -222,14 +222,16 @@ spec:
222222
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
223223
- name: CACHI2_ARTIFACT
224224
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
225+
- name: BUILDAH_FORMAT
226+
value: $(params.buildah-format)
225227
runAfter:
226228
- prefetch-dependencies
227229
taskRef:
228230
params:
229231
- name: name
230232
value: buildah-oci-ta
231233
- name: bundle
232-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:203b7a3d8c04c1f3b5327db3f31a19647f8d46304e7ced1dd5dcbba19445ac10
234+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
233235
- name: kind
234236
value: task
235237
resolver: bundles
@@ -251,14 +253,16 @@ spec:
251253
- name: IMAGES
252254
value:
253255
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
256+
- name: BUILDAH_FORMAT
257+
value: $(params.buildah-format)
254258
runAfter:
255259
- build-container
256260
taskRef:
257261
params:
258262
- name: name
259263
value: build-image-index
260264
- name: bundle
261-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
265+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
262266
- name: kind
263267
value: task
264268
resolver: bundles
@@ -310,7 +314,7 @@ spec:
310314
- name: name
311315
value: deprecated-image-check
312316
- name: bundle
313-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
317+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
314318
- name: kind
315319
value: task
316320
resolver: bundles

.tekton/managed-cluster-validating-webhooks-pull-request.yaml

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
1111
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "master"
12-
creationTimestamp: null
12+
creationTimestamp:
1313
labels:
1414
appstudio.openshift.io/application: managed-cluster-validating-webhooks
1515
appstudio.openshift.io/component: managed-cluster-validating-webhooks
@@ -32,7 +32,7 @@ spec:
3232
value: .
3333
- name: build-args
3434
value:
35-
- BASE_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24
35+
- BASE_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24
3636
pipelineSpec:
3737
description: |
3838
This pipeline is ideal for building container images from a Containerfile while maintaining trust after pipeline customization.
@@ -64,13 +64,11 @@ spec:
6464
name: output-image
6565
type: string
6666
- default: .
67-
description: Path to the source code of an application's component from where
68-
to build image.
67+
description: Path to the source code of an application's component from where to build image.
6968
name: path-context
7069
type: string
7170
- default: Dockerfile
72-
description: Path to the Dockerfile inside the context specified by parameter
73-
path-context
71+
description: Path to the Dockerfile inside the context specified by parameter path-context
7472
name: dockerfile
7573
type: string
7674
- default: "false"
@@ -90,8 +88,7 @@ spec:
9088
name: prefetch-input
9189
type: string
9290
- default: ""
93-
description: Image tag expiration time, time values could be something like
94-
1h, 2d, 3w for hours, days, and weeks, respectively.
91+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9592
name: image-expires-after
9693
type: string
9794
- default: "false"
@@ -103,7 +100,7 @@ spec:
103100
name: build-image-index
104101
type: string
105102
- default:
106-
- BASE_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24
103+
- BASE_IMAGE=brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.24
107104
description: Array of --build-arg values ("arg=value" strings) for buildah
108105
name: build-args
109106
type: array
@@ -112,10 +109,13 @@ spec:
112109
name: build-args-file
113110
type: string
114111
- default: "false"
115-
description: Whether to enable privileged mode, should be used only with remote
116-
VMs
112+
description: Whether to enable privileged mode, should be used only with remote VMs
117113
name: privileged-nested
118114
type: string
115+
- name: buildah-format
116+
default: docker
117+
type: string
118+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
119119
results:
120120
- description: ""
121121
name: IMAGE_URL
@@ -143,7 +143,7 @@ spec:
143143
- name: name
144144
value: init
145145
- name: bundle
146-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
146+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
147147
- name: kind
148148
value: task
149149
resolver: bundles
@@ -193,7 +193,7 @@ spec:
193193
- name: name
194194
value: prefetch-dependencies-oci-ta
195195
- name: bundle
196-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
196+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:dc82a7270aace9b1c26f7e96f8ccab2752e53d32980c41a45e1733baad76cde6
197197
- name: kind
198198
value: task
199199
resolver: bundles
@@ -229,14 +229,16 @@ spec:
229229
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
230230
- name: CACHI2_ARTIFACT
231231
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
232+
- name: BUILDAH_FORMAT
233+
value: $(params.buildah-format)
232234
runAfter:
233235
- prefetch-dependencies
234236
taskRef:
235237
params:
236238
- name: name
237239
value: buildah-oci-ta
238240
- name: bundle
239-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:203b7a3d8c04c1f3b5327db3f31a19647f8d46304e7ced1dd5dcbba19445ac10
241+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.5@sha256:6ec006242975a17388bfe813e2afd0ae721dd013247580c0d988e3c4a9c7f867
240242
- name: kind
241243
value: task
242244
resolver: bundles
@@ -258,14 +260,16 @@ spec:
258260
- name: IMAGES
259261
value:
260262
- $(tasks.build-container.results.IMAGE_URL)@$(tasks.build-container.results.IMAGE_DIGEST)
263+
- name: BUILDAH_FORMAT
264+
value: $(params.buildah-format)
261265
runAfter:
262266
- build-container
263267
taskRef:
264268
params:
265269
- name: name
266270
value: build-image-index
267271
- name: bundle
268-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
272+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:79784d53749584bc5a8de32142ec4e2f01cdbf42c20d94e59280e0b927c8597d
269273
- name: kind
270274
value: task
271275
resolver: bundles
@@ -317,7 +321,7 @@ spec:
317321
- name: name
318322
value: deprecated-image-check
319323
- name: bundle
320-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
324+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
321325
- name: kind
322326
value: task
323327
resolver: bundles

0 commit comments

Comments
 (0)