Skip to content

Commit 2d3e036

Browse files
Merge pull request #401 from validatedpatterns/konflux/references/main
Update Konflux references
2 parents f11649c + 86db990 commit 2d3e036

4 files changed

Lines changed: 116 additions & 94 deletions

File tree

.tekton/bundle-pull-request.yaml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ metadata:
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
11-
== "main"
12-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main"
11+
creationTimestamp:
1312
labels:
1413
appstudio.openshift.io/application: patterns-operator
1514
appstudio.openshift.io/component: bundle
@@ -79,13 +78,11 @@ spec:
7978
name: output-image
8079
type: string
8180
- default: .
82-
description: Path to the source code of an application's component from where
83-
to build image.
81+
description: Path to the source code of an application's component from where to build image.
8482
name: path-context
8583
type: string
8684
- default: Dockerfile
87-
description: Path to the Dockerfile inside the context specified by parameter
88-
path-context
85+
description: Path to the Dockerfile inside the context specified by parameter path-context
8986
name: dockerfile
9087
type: string
9188
- default: "false"
@@ -109,18 +106,20 @@ spec:
109106
name: java
110107
type: string
111108
- default: ""
112-
description: Image tag expiration time, time values could be something like
113-
1h, 2d, 3w for hours, days, and weeks, respectively.
109+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
114110
name: image-expires-after
115111
- default: "false"
116112
description: Build a source image.
117113
name: build-source-image
118114
type: string
119115
- default: ""
120-
description: Path to a file with build arguments which will be passed to podman
121-
during build
116+
description: Path to a file with build arguments which will be passed to podman during build
122117
name: build-args-file
123118
type: string
119+
- name: buildah-format
120+
default: docker
121+
type: string
122+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
124123
results:
125124
- description: ""
126125
name: IMAGE_URL
@@ -148,7 +147,7 @@ spec:
148147
- name: name
149148
value: init
150149
- name: bundle
151-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ded314206f09712b2116deb050b774ae7efef9ab243794334c8e616871a3ffa5
150+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
152151
- name: kind
153152
value: task
154153
resolver: bundles
@@ -165,7 +164,7 @@ spec:
165164
- name: name
166165
value: git-clone
167166
- name: bundle
168-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:7939000e2f92fc8b5d2c4ee4ba9000433c5aa7700d2915a1d4763853d5fd1fd4
167+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:b1fba408e3f50cc302eb5bf66bae1775535267427c78b0665d8342931d54f6ff
169168
- name: kind
170169
value: task
171170
resolver: bundles
@@ -190,7 +189,7 @@ spec:
190189
- name: name
191190
value: prefetch-dependencies
192191
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:638949291807f343c7e49076f32d835a1a8c0e8382492a59abc226188bcc129a
192+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:4e178d3f538bd20cb84d94a2542724fb2eed92eaebaf76275ce514ceca7a13b7
194193
- name: kind
195194
value: task
196195
resolver: bundles
@@ -222,14 +221,16 @@ spec:
222221
value: $(tasks.clone-repository.results.commit)
223222
- name: BUILD_ARGS_FILE
224223
value: $(params.build-args-file)
224+
- name: BUILDAH_FORMAT
225+
value: $(params.buildah-format)
225226
runAfter:
226227
- prefetch-dependencies
227228
taskRef:
228229
params:
229230
- name: name
230231
value: buildah
231232
- name: bundle
232-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:864234f0c4dfb2c537129e19e999274b2c83de4a4bd15771406a20c9f3f4f37d
233+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.5@sha256:9ac12870766a980e1f7ae7ddd0852f767da000d8a6d24f5b37e906eb14932355
233234
- name: kind
234235
value: task
235236
resolver: bundles
@@ -244,15 +245,17 @@ spec:
244245
- name: build-source-image
245246
params:
246247
- name: BINARY_IMAGE
247-
value: $(params.output-image)
248+
value: $(tasks.build-container.results.IMAGE_URL)
249+
- name: BINARY_IMAGE_DIGEST
250+
value: $(tasks.build-container.results.IMAGE_DIGEST)
248251
runAfter:
249252
- build-container
250253
taskRef:
251254
params:
252255
- name: name
253256
value: source-build
254257
- name: bundle
255-
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:16df0d516e4ed85a856fca403d38334e59ad19e1e3150e3bbc7135097854a34e
258+
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.3@sha256:268bf4dba7455ef3871d84bc26de1800b8221a0d1809c9f5101616bccfa84d33
256259
- name: kind
257260
value: task
258261
resolver: bundles
@@ -281,7 +284,7 @@ spec:
281284
- name: name
282285
value: deprecated-image-check
283286
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:c49732039f105de809840be396f83ead8c46f6a6948e1335b76d37e9eb469574
287+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
285288
- name: kind
286289
value: task
287290
resolver: bundles
@@ -303,7 +306,7 @@ spec:
303306
- name: name
304307
value: clair-scan
305308
- name: bundle
306-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
309+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
307310
- name: kind
308311
value: task
309312
resolver: bundles
@@ -323,7 +326,7 @@ spec:
323326
- name: name
324327
value: ecosystem-cert-preflight-checks
325328
- name: bundle
326-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:365c65ed8dfbd83c4a49300dcb9c74c5c3f027efec0be1a1f0baa9633c29b249
329+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
327330
- name: kind
328331
value: task
329332
resolver: bundles
@@ -334,13 +337,18 @@ spec:
334337
- "false"
335338
- name: sast-snyk-check
336339
runAfter:
337-
- clone-repository
340+
- build-container
341+
params:
342+
- name: image-digest
343+
value: $(tasks.build-container.results.IMAGE_DIGEST)
344+
- name: image-url
345+
value: $(tasks.build-container.results.IMAGE_URL)
338346
taskRef:
339347
params:
340348
- name: name
341349
value: sast-snyk-check
342350
- name: bundle
343-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:5b4ebc5f64164aa1011c7706b9d895c66e3dd3377d1927ed435c116c1202563c
351+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:646d3d668451e29f8393ff169a3e2f165d0f297e6e20001203078712688a0fef
344352
- name: kind
345353
value: task
346354
resolver: bundles
@@ -365,7 +373,7 @@ spec:
365373
- name: name
366374
value: clamav-scan
367375
- name: bundle
368-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:a1de3c8134db8119480a726d60e96a6c4907f81b92b789e7d39d78d239ab638c
376+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
369377
- name: kind
370378
value: task
371379
resolver: bundles
@@ -384,7 +392,7 @@ spec:
384392
- name: workspace
385393
volumeClaimTemplate:
386394
metadata:
387-
creationTimestamp: null
395+
creationTimestamp:
388396
spec:
389397
accessModes:
390398
- ReadWriteOnce

.tekton/bundle-push.yaml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/max-keep-runs: "3"
9-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
10-
== "main"
11-
creationTimestamp: null
9+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "main"
10+
creationTimestamp:
1211
labels:
1312
appstudio.openshift.io/application: patterns-operator
1413
appstudio.openshift.io/component: bundle
@@ -76,13 +75,11 @@ spec:
7675
name: output-image
7776
type: string
7877
- default: .
79-
description: Path to the source code of an application's component from where
80-
to build image.
78+
description: Path to the source code of an application's component from where to build image.
8179
name: path-context
8280
type: string
8381
- default: Dockerfile
84-
description: Path to the Dockerfile inside the context specified by parameter
85-
path-context
82+
description: Path to the Dockerfile inside the context specified by parameter path-context
8683
name: dockerfile
8784
type: string
8885
- default: "false"
@@ -106,18 +103,20 @@ spec:
106103
name: java
107104
type: string
108105
- default: ""
109-
description: Image tag expiration time, time values could be something like
110-
1h, 2d, 3w for hours, days, and weeks, respectively.
106+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
111107
name: image-expires-after
112108
- default: "false"
113109
description: Build a source image.
114110
name: build-source-image
115111
type: string
116112
- default: ""
117-
description: Path to a file with build arguments which will be passed to podman
118-
during build
113+
description: Path to a file with build arguments which will be passed to podman during build
119114
name: build-args-file
120115
type: string
116+
- name: buildah-format
117+
default: docker
118+
type: string
119+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
121120
results:
122121
- description: ""
123122
name: IMAGE_URL
@@ -145,7 +144,7 @@ spec:
145144
- name: name
146145
value: init
147146
- name: bundle
148-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ded314206f09712b2116deb050b774ae7efef9ab243794334c8e616871a3ffa5
147+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:abf231cfc5a68b56f68a8ac9bb26dca3c3e434c88dd9627c72bdec0b8c335c67
149148
- name: kind
150149
value: task
151150
resolver: bundles
@@ -162,7 +161,7 @@ spec:
162161
- name: name
163162
value: git-clone
164163
- name: bundle
165-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:7939000e2f92fc8b5d2c4ee4ba9000433c5aa7700d2915a1d4763853d5fd1fd4
164+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone:0.1@sha256:b1fba408e3f50cc302eb5bf66bae1775535267427c78b0665d8342931d54f6ff
166165
- name: kind
167166
value: task
168167
resolver: bundles
@@ -187,7 +186,7 @@ spec:
187186
- name: name
188187
value: prefetch-dependencies
189188
- name: bundle
190-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:638949291807f343c7e49076f32d835a1a8c0e8382492a59abc226188bcc129a
189+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies:0.2@sha256:4e178d3f538bd20cb84d94a2542724fb2eed92eaebaf76275ce514ceca7a13b7
191190
- name: kind
192191
value: task
193192
resolver: bundles
@@ -219,14 +218,16 @@ spec:
219218
value: $(tasks.clone-repository.results.commit)
220219
- name: BUILD_ARGS_FILE
221220
value: $(params.build-args-file)
221+
- name: BUILDAH_FORMAT
222+
value: $(params.buildah-format)
222223
runAfter:
223224
- prefetch-dependencies
224225
taskRef:
225226
params:
226227
- name: name
227228
value: buildah
228229
- name: bundle
229-
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.4@sha256:864234f0c4dfb2c537129e19e999274b2c83de4a4bd15771406a20c9f3f4f37d
230+
value: quay.io/konflux-ci/tekton-catalog/task-buildah:0.5@sha256:9ac12870766a980e1f7ae7ddd0852f767da000d8a6d24f5b37e906eb14932355
230231
- name: kind
231232
value: task
232233
resolver: bundles
@@ -241,15 +242,17 @@ spec:
241242
- name: build-source-image
242243
params:
243244
- name: BINARY_IMAGE
244-
value: $(params.output-image)
245+
value: $(tasks.build-container.results.IMAGE_URL)
246+
- name: BINARY_IMAGE_DIGEST
247+
value: $(tasks.build-container.results.IMAGE_DIGEST)
245248
runAfter:
246249
- build-container
247250
taskRef:
248251
params:
249252
- name: name
250253
value: source-build
251254
- name: bundle
252-
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.2@sha256:16df0d516e4ed85a856fca403d38334e59ad19e1e3150e3bbc7135097854a34e
255+
value: quay.io/konflux-ci/tekton-catalog/task-source-build:0.3@sha256:268bf4dba7455ef3871d84bc26de1800b8221a0d1809c9f5101616bccfa84d33
253256
- name: kind
254257
value: task
255258
resolver: bundles
@@ -278,7 +281,7 @@ spec:
278281
- name: name
279282
value: deprecated-image-check
280283
- name: bundle
281-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:c49732039f105de809840be396f83ead8c46f6a6948e1335b76d37e9eb469574
284+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:f59175d9a0a60411738228dfe568af4684af4aa5e7e05c832927cb917801d489
282285
- name: kind
283286
value: task
284287
resolver: bundles
@@ -300,7 +303,7 @@ spec:
300303
- name: name
301304
value: clair-scan
302305
- name: bundle
303-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
306+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
304307
- name: kind
305308
value: task
306309
resolver: bundles
@@ -320,7 +323,7 @@ spec:
320323
- name: name
321324
value: ecosystem-cert-preflight-checks
322325
- name: bundle
323-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:365c65ed8dfbd83c4a49300dcb9c74c5c3f027efec0be1a1f0baa9633c29b249
326+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
324327
- name: kind
325328
value: task
326329
resolver: bundles
@@ -331,13 +334,18 @@ spec:
331334
- "false"
332335
- name: sast-snyk-check
333336
runAfter:
334-
- clone-repository
337+
- build-container
338+
params:
339+
- name: image-digest
340+
value: $(tasks.build-container.results.IMAGE_DIGEST)
341+
- name: image-url
342+
value: $(tasks.build-container.results.IMAGE_URL)
335343
taskRef:
336344
params:
337345
- name: name
338346
value: sast-snyk-check
339347
- name: bundle
340-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.3@sha256:5b4ebc5f64164aa1011c7706b9d895c66e3dd3377d1927ed435c116c1202563c
348+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check:0.4@sha256:646d3d668451e29f8393ff169a3e2f165d0f297e6e20001203078712688a0fef
341349
- name: kind
342350
value: task
343351
resolver: bundles
@@ -362,7 +370,7 @@ spec:
362370
- name: name
363371
value: clamav-scan
364372
- name: bundle
365-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:a1de3c8134db8119480a726d60e96a6c4907f81b92b789e7d39d78d239ab638c
373+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
366374
- name: kind
367375
value: task
368376
resolver: bundles
@@ -381,7 +389,7 @@ spec:
381389
- name: workspace
382390
volumeClaimTemplate:
383391
metadata:
384-
creationTimestamp: null
392+
creationTimestamp:
385393
spec:
386394
accessModes:
387395
- ReadWriteOnce

0 commit comments

Comments
 (0)