Skip to content

Commit 426f55b

Browse files
authored
Merge pull request #332 from Commonjava/konflux/references/kflux
Update Konflux references
2 parents c492dd7 + 6cbecdf commit 426f55b

File tree

2 files changed

+40
-46
lines changed

2 files changed

+40
-46
lines changed

.tekton/charon-pull-request.yaml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@ metadata:
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
99
pipelinesascode.tekton.dev/cancel-in-progress: "true"
1010
pipelinesascode.tekton.dev/max-keep-runs: "3"
11-
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
12-
== "kflux"
13-
creationTimestamp: null
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "kflux"
12+
creationTimestamp:
1413
labels:
1514
appstudio.openshift.io/application: charon
1615
appstudio.openshift.io/component: charon
@@ -47,7 +46,7 @@ spec:
4746
- name: name
4847
value: show-sbom
4948
- name: bundle
50-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:002f7c8c1d2f9e09904035da414aba1188ae091df0ea9532cd997be05e73d594
49+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:1b1df4da95966d08ac6a5b8198710e09e68b5c2cdc707c37d9d19769e65884b2
5150
- name: kind
5251
value: task
5352
resolver: bundles
@@ -63,13 +62,11 @@ spec:
6362
name: output-image
6463
type: string
6564
- default: .
66-
description: Path to the source code of an application's component from where
67-
to build image.
65+
description: Path to the source code of an application's component from where to build image.
6866
name: path-context
6967
type: string
7068
- default: Dockerfile
71-
description: Path to the Dockerfile inside the context specified by parameter
72-
path-context
69+
description: Path to the Dockerfile inside the context specified by parameter path-context
7370
name: dockerfile
7471
type: string
7572
- default: "false"
@@ -89,8 +86,7 @@ spec:
8986
name: prefetch-input
9087
type: string
9188
- default: ""
92-
description: Image tag expiration time, time values could be something like
93-
1h, 2d, 3w for hours, days, and weeks, respectively.
89+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9490
name: image-expires-after
9591
- default: "false"
9692
description: Build a source image.
@@ -109,8 +105,7 @@ spec:
109105
name: build-args-file
110106
type: string
111107
- default: "false"
112-
description: Whether to enable privileged mode, should be used only with remote
113-
VMs
108+
description: Whether to enable privileged mode, should be used only with remote VMs
114109
name: privileged-nested
115110
type: string
116111
results:
@@ -161,7 +156,7 @@ spec:
161156
- name: name
162157
value: git-clone-oci-ta
163158
- name: bundle
164-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0e512b12775b2bcc4eb47bb34b7a2db2e91c3ceef04b2f2487fa421032d8859a
159+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d35e5d501cb5f5f88369511f76249857cb5ac30250e1dcf086939321964ff6b9
165160
- name: kind
166161
value: task
167162
resolver: bundles
@@ -190,7 +185,7 @@ spec:
190185
- name: name
191186
value: prefetch-dependencies-oci-ta
192187
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d0cbc492da865be336d09926eb6e3494403dccaa4a212bbdf472d8adbf80ab08
188+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:f10a4841e6f75fbb314b1d8cbf14f652499c1fe7f59e59aed59f7431c680aa17
194189
- name: kind
195190
value: task
196191
resolver: bundles
@@ -233,7 +228,7 @@ spec:
233228
- name: name
234229
value: buildah-oci-ta
235230
- name: bundle
236-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:d90c4cf682189faab5c702e55f4855242e228ce1a05e54e1734b7b9c6fa40441
231+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:48b99ad18fd3bde2d22ec2c397d36c55e45ca90ddf1620c9e00bdee518e297bf
237232
- name: kind
238233
value: task
239234
resolver: bundles
@@ -262,7 +257,7 @@ spec:
262257
- name: name
263258
value: build-image-index
264259
- name: bundle
265-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3cf3dcc0bf7b674b940063b4d55e41fe7d43636a1d82572e3850228aa5350fa8
260+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:846dc9975914f31380ec2712fdbac9df3b06c00a9cc7df678315a7f97145efc2
266261
- name: kind
267262
value: task
268263
resolver: bundles
@@ -274,19 +269,21 @@ spec:
274269
- name: build-source-image
275270
params:
276271
- name: BINARY_IMAGE
277-
value: $(params.output-image)
272+
value: $(tasks.build-image-index.results.IMAGE_URL)
278273
- name: SOURCE_ARTIFACT
279274
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
280275
- name: CACHI2_ARTIFACT
281276
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
277+
- name: BINARY_IMAGE_DIGEST
278+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
282279
runAfter:
283280
- build-image-index
284281
taskRef:
285282
params:
286283
- name: name
287284
value: source-build-oci-ta
288285
- name: bundle
289-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:f0784e8e0e396f40a6523693825b5966c3c615ba3d342350165e83cb72a24ef7
286+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
290287
- name: kind
291288
value: task
292289
resolver: bundles
@@ -312,7 +309,7 @@ spec:
312309
- name: name
313310
value: deprecated-image-check
314311
- name: bundle
315-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:270a79138a98e43c366d3722978cb5940d2bcb822ba6b60377330f863b7a1e62
312+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:3c8b81fa868e27c6266e7660a4bfb4c822846dcf4304606e71e20893b0d3e515
316313
- name: kind
317314
value: task
318315
resolver: bundles
@@ -354,7 +351,7 @@ spec:
354351
- name: name
355352
value: ecosystem-cert-preflight-checks
356353
- name: bundle
357-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:95ca11d147ee97d98f495477e9f42afe94ba3f869fc81c4e7b241ebd21e7395f
354+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:abbe195626eec925288df6425679559025d1be4af5ae70ca6dbbcb49ad3bf08b
358355
- name: kind
359356
value: task
360357
resolver: bundles
@@ -447,7 +444,7 @@ spec:
447444
- name: name
448445
value: sast-coverity-check-oci-ta
449446
- name: bundle
450-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:dda889f85faa30eb18db4f195bc03428e8913afa14624552d2cb9f714c786dbf
447+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:c926568ce63e4f63e18bb6a4178caca2e8192f6e3b830bbcd354e6485d29458c
451448
- name: kind
452449
value: task
453450
resolver: bundles
@@ -494,7 +491,7 @@ spec:
494491
- name: name
495492
value: sast-shell-check-oci-ta
496493
- name: bundle
497-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1e8f18f892e16f5d0fc0f42ae8512e3c78251d43cd9d9f7cfd3f6667242bf619
494+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:808bcaf75271db6a999f53fdefb973a385add94a277d37fbd3df68f8ac7dfaa3
498495
- name: kind
499496
value: task
500497
resolver: bundles
@@ -520,7 +517,7 @@ spec:
520517
- name: name
521518
value: sast-unicode-check-oci-ta
522519
- name: bundle
523-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:24ad71fde435fc25abba2c4c550beb088b1530f738d3c377e2f635b5f320d57b
520+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
524521
- name: kind
525522
value: task
526523
resolver: bundles

.tekton/charon-push.yaml

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,8 @@ metadata:
77
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
88
pipelinesascode.tekton.dev/cancel-in-progress: "false"
99
pipelinesascode.tekton.dev/max-keep-runs: "3"
10-
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch
11-
== "kflux"
12-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "kflux"
11+
creationTimestamp:
1312
labels:
1413
appstudio.openshift.io/application: charon
1514
appstudio.openshift.io/component: charon
@@ -44,7 +43,7 @@ spec:
4443
- name: name
4544
value: show-sbom
4645
- name: bundle
47-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:002f7c8c1d2f9e09904035da414aba1188ae091df0ea9532cd997be05e73d594
46+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:1b1df4da95966d08ac6a5b8198710e09e68b5c2cdc707c37d9d19769e65884b2
4847
- name: kind
4948
value: task
5049
resolver: bundles
@@ -60,13 +59,11 @@ spec:
6059
name: output-image
6160
type: string
6261
- default: .
63-
description: Path to the source code of an application's component from where
64-
to build image.
62+
description: Path to the source code of an application's component from where to build image.
6563
name: path-context
6664
type: string
6765
- default: Dockerfile
68-
description: Path to the Dockerfile inside the context specified by parameter
69-
path-context
66+
description: Path to the Dockerfile inside the context specified by parameter path-context
7067
name: dockerfile
7168
type: string
7269
- default: "false"
@@ -86,8 +83,7 @@ spec:
8683
name: prefetch-input
8784
type: string
8885
- default: ""
89-
description: Image tag expiration time, time values could be something like
90-
1h, 2d, 3w for hours, days, and weeks, respectively.
86+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9187
name: image-expires-after
9288
- default: "false"
9389
description: Build a source image.
@@ -106,8 +102,7 @@ spec:
106102
name: build-args-file
107103
type: string
108104
- default: "false"
109-
description: Whether to enable privileged mode, should be used only with remote
110-
VMs
105+
description: Whether to enable privileged mode, should be used only with remote VMs
111106
name: privileged-nested
112107
type: string
113108
results:
@@ -158,7 +153,7 @@ spec:
158153
- name: name
159154
value: git-clone-oci-ta
160155
- name: bundle
161-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:0e512b12775b2bcc4eb47bb34b7a2db2e91c3ceef04b2f2487fa421032d8859a
156+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:d35e5d501cb5f5f88369511f76249857cb5ac30250e1dcf086939321964ff6b9
162157
- name: kind
163158
value: task
164159
resolver: bundles
@@ -187,7 +182,7 @@ spec:
187182
- name: name
188183
value: prefetch-dependencies-oci-ta
189184
- name: bundle
190-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d0cbc492da865be336d09926eb6e3494403dccaa4a212bbdf472d8adbf80ab08
185+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:f10a4841e6f75fbb314b1d8cbf14f652499c1fe7f59e59aed59f7431c680aa17
191186
- name: kind
192187
value: task
193188
resolver: bundles
@@ -230,7 +225,7 @@ spec:
230225
- name: name
231226
value: buildah-oci-ta
232227
- name: bundle
233-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:d90c4cf682189faab5c702e55f4855242e228ce1a05e54e1734b7b9c6fa40441
228+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:48b99ad18fd3bde2d22ec2c397d36c55e45ca90ddf1620c9e00bdee518e297bf
234229
- name: kind
235230
value: task
236231
resolver: bundles
@@ -259,7 +254,7 @@ spec:
259254
- name: name
260255
value: build-image-index
261256
- name: bundle
262-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:3cf3dcc0bf7b674b940063b4d55e41fe7d43636a1d82572e3850228aa5350fa8
257+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:846dc9975914f31380ec2712fdbac9df3b06c00a9cc7df678315a7f97145efc2
263258
- name: kind
264259
value: task
265260
resolver: bundles
@@ -271,19 +266,21 @@ spec:
271266
- name: build-source-image
272267
params:
273268
- name: BINARY_IMAGE
274-
value: $(params.output-image)
269+
value: $(tasks.build-image-index.results.IMAGE_URL)
275270
- name: SOURCE_ARTIFACT
276271
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
277272
- name: CACHI2_ARTIFACT
278273
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
274+
- name: BINARY_IMAGE_DIGEST
275+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
279276
runAfter:
280277
- build-image-index
281278
taskRef:
282279
params:
283280
- name: name
284281
value: source-build-oci-ta
285282
- name: bundle
286-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:f0784e8e0e396f40a6523693825b5966c3c615ba3d342350165e83cb72a24ef7
283+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
287284
- name: kind
288285
value: task
289286
resolver: bundles
@@ -309,7 +306,7 @@ spec:
309306
- name: name
310307
value: deprecated-image-check
311308
- name: bundle
312-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:270a79138a98e43c366d3722978cb5940d2bcb822ba6b60377330f863b7a1e62
309+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:3c8b81fa868e27c6266e7660a4bfb4c822846dcf4304606e71e20893b0d3e515
313310
- name: kind
314311
value: task
315312
resolver: bundles
@@ -351,7 +348,7 @@ spec:
351348
- name: name
352349
value: ecosystem-cert-preflight-checks
353350
- name: bundle
354-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:95ca11d147ee97d98f495477e9f42afe94ba3f869fc81c4e7b241ebd21e7395f
351+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:abbe195626eec925288df6425679559025d1be4af5ae70ca6dbbcb49ad3bf08b
355352
- name: kind
356353
value: task
357354
resolver: bundles
@@ -444,7 +441,7 @@ spec:
444441
- name: name
445442
value: sast-coverity-check-oci-ta
446443
- name: bundle
447-
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:dda889f85faa30eb18db4f195bc03428e8913afa14624552d2cb9f714c786dbf
444+
value: quay.io/konflux-ci/tekton-catalog/task-sast-coverity-check-oci-ta:0.3@sha256:c926568ce63e4f63e18bb6a4178caca2e8192f6e3b830bbcd354e6485d29458c
448445
- name: kind
449446
value: task
450447
resolver: bundles
@@ -491,7 +488,7 @@ spec:
491488
- name: name
492489
value: sast-shell-check-oci-ta
493490
- name: bundle
494-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:1e8f18f892e16f5d0fc0f42ae8512e3c78251d43cd9d9f7cfd3f6667242bf619
491+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:808bcaf75271db6a999f53fdefb973a385add94a277d37fbd3df68f8ac7dfaa3
495492
- name: kind
496493
value: task
497494
resolver: bundles
@@ -517,7 +514,7 @@ spec:
517514
- name: name
518515
value: sast-unicode-check-oci-ta
519516
- name: bundle
520-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:24ad71fde435fc25abba2c4c550beb088b1530f738d3c377e2f635b5f320d57b
517+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
521518
- name: kind
522519
value: task
523520
resolver: bundles

0 commit comments

Comments
 (0)