Skip to content

Commit d6c416d

Browse files
authored
Merge pull request #2942 from conforma/konflux/references/main
Update Konflux references (main)
2 parents 1911094 + a800636 commit d6c416d

File tree

2 files changed

+58
-70
lines changed

2 files changed

+58
-70
lines changed

.tekton/cli-main-pull-request.yaml

Lines changed: 29 additions & 35 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-
== "main"
13-
creationTimestamp: null
11+
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch == "main"
12+
creationTimestamp:
1413
labels:
1514
appstudio.openshift.io/application: ec-main
1615
appstudio.openshift.io/component: cli-main
@@ -34,8 +33,7 @@ spec:
3433
- name: path-context
3534
value: .
3635
- name: prefetch-input
37-
value: '[{"type": "gomod"}, {"type": "gomod", "path": "tools/kubectl"}, {"type":
38-
"rpm"}]'
36+
value: '[{"type": "gomod"}, {"type": "gomod", "path": "tools/kubectl"}, {"type": "rpm"}]'
3937
- name: build-source-image
4038
value: "true"
4139
- name: build-args-file
@@ -61,22 +59,15 @@ spec:
6159
name: output-image
6260
type: string
6361
- description: >-
64-
OCI repository of the CLI image to use as a reference in the Tekton bundle. When setting
65-
this value, take into account where the CLI image will be available for usage. For certain
66-
workflows, e.g. pull request, this should be the repo in which the CLI image is built into
67-
because those CLI images are not promoted to another location. For merge workflows that go
68-
through a release, for example, this should be the repository for which the CLI image will
69-
be released to.
62+
OCI repository of the CLI image to use as a reference in the Tekton bundle. When setting this value, take into account where the CLI image will be available for usage. For certain workflows, e.g. pull request, this should be the repo in which the CLI image is built into because those CLI images are not promoted to another location. For merge workflows that go through a release, for example, this should be the repository for which the CLI image will be released to.
7063
name: bundle-cli-ref-repo
7164
type: string
7265
- default: .
73-
description: Path to the source code of an application's component from where
74-
to build image.
66+
description: Path to the source code of an application's component from where to build image.
7567
name: path-context
7668
type: string
7769
- default: Dockerfile
78-
description: Path to the Dockerfile inside the context specified by parameter
79-
path-context
70+
description: Path to the Dockerfile inside the context specified by parameter path-context
8071
name: dockerfile
8172
type: string
8273
- default: "false"
@@ -96,8 +87,7 @@ spec:
9687
name: prefetch-input
9788
type: string
9889
- default: ""
99-
description: Image tag expiration time, time values could be something like
100-
1h, 2d, 3w for hours, days, and weeks, respectively.
90+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
10191
name: image-expires-after
10292
type: string
10393
- default: "false"
@@ -117,8 +107,7 @@ spec:
117107
name: build-args-file
118108
type: string
119109
- default: "false"
120-
description: Whether to enable privileged mode, should be used only with remote
121-
VMs
110+
description: Whether to enable privileged mode, should be used only with remote VMs
122111
name: privileged-nested
123112
type: string
124113
- default:
@@ -153,7 +142,7 @@ spec:
153142
- name: name
154143
value: init
155144
- name: bundle
156-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ded314206f09712b2116deb050b774ae7efef9ab243794334c8e616871a3ffa5
145+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
157146
- name: kind
158147
value: task
159148
resolver: bundles
@@ -178,7 +167,7 @@ spec:
178167
- name: name
179168
value: git-clone-oci-ta
180169
- name: bundle
181-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:4a601aeec58a1dd89c271e728fd8f0d84777825b46940c3aec27f15bab3edacf
170+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3f1b468066b301083d8550e036f5a654fcb064810bd29eb06fec6d8ad3e35b9c
182171
- name: kind
183172
value: task
184173
resolver: bundles
@@ -209,7 +198,7 @@ spec:
209198
- name: name
210199
value: prefetch-dependencies-oci-ta
211200
- name: bundle
212-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:05551e144d090844903d61893a383fa4dc69ab563797f03ffaab0f8624bf530d
201+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:098322d6b789824f716f2d9caca1862d4afdc083ebaaee61aadd22a8c179480a
213202
- name: kind
214203
value: task
215204
resolver: bundles
@@ -258,7 +247,7 @@ spec:
258247
- name: name
259248
value: buildah-remote-oci-ta
260249
- name: bundle
261-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:252e5c94fb2375c43bdfd4b65097d246f4f37392956b08e5c38f366623a0b9ce
250+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.5@sha256:17a0b093c9e9d21e9e374c60a88eb293a0fa57e4e2b67baf20ccac9735aa20ff
262251
- name: kind
263252
value: task
264253
resolver: bundles
@@ -287,7 +276,7 @@ spec:
287276
- name: name
288277
value: build-image-index
289278
- name: bundle
290-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:ba7fbed5c4862968c1a77d6b90d5bdd497925ab1de41b859c027dd5c3069cd3e
279+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:8e5dfb2fac011148f8715bbe0b99415f88297683d269eae0dfcad52562195d45
291280
- name: kind
292281
value: task
293282
resolver: bundles
@@ -313,7 +302,7 @@ spec:
313302
- name: name
314303
value: source-build-oci-ta
315304
- name: bundle
316-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:7a36cc284c5932c18e117fe5995f3246b5dcc11ec742b66a2f9ae710034b064f
305+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b0d6cb28a23f20db4f5cf78ed78ae3a91b9a5adfe989696ed0bbc63840a485b6
317306
- name: kind
318307
value: task
319308
resolver: bundles
@@ -347,7 +336,7 @@ spec:
347336
- name: name
348337
value: tkn-bundle-oci-ta
349338
- name: bundle
350-
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:43e20b7e039152dc08acf00fa60c15f36be238fd5c5e0830ef6e53c339c13b78
339+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:9713f360e1cb7aa37fc98b633affcaf002ddfee5362b75123447d148cf0f8960
351340
- name: kind
352341
value: task
353342
resolver: bundles
@@ -369,7 +358,7 @@ spec:
369358
- name: name
370359
value: deprecated-image-check
371360
- name: bundle
372-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:c49732039f105de809840be396f83ead8c46f6a6948e1335b76d37e9eb469574
361+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:2c32152a55f6bfba67b41be456da46b6e109bb3e348e25220eed4eed149958c5
373362
- name: kind
374363
value: task
375364
resolver: bundles
@@ -378,7 +367,12 @@ spec:
378367
operator: in
379368
values:
380369
- "false"
381-
- name: clair-scan
370+
- matrix:
371+
params:
372+
- name: image-platform
373+
value:
374+
- $(params.build-platforms)
375+
name: clair-scan
382376
params:
383377
- name: image-digest
384378
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -391,7 +385,7 @@ spec:
391385
- name: name
392386
value: clair-scan
393387
- name: bundle
394-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
388+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
395389
- name: kind
396390
value: task
397391
resolver: bundles
@@ -411,7 +405,7 @@ spec:
411405
- name: name
412406
value: ecosystem-cert-preflight-checks
413407
- name: bundle
414-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:e106b6182e72c8f34ceae3f56b0b1aa2b4dc60f573877d9e51c3791029a7acb6
408+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
415409
- name: kind
416410
value: task
417411
resolver: bundles
@@ -437,7 +431,7 @@ spec:
437431
- name: name
438432
value: sast-snyk-check-oci-ta
439433
- name: bundle
440-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e371aa09c65ab309138b4aeae9ea4dd93f83119c5cc61e9f2057fe5bb518fbe9
434+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
441435
- name: kind
442436
value: task
443437
resolver: bundles
@@ -459,7 +453,7 @@ spec:
459453
- name: name
460454
value: clamav-scan
461455
- name: bundle
462-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:a1de3c8134db8119480a726d60e96a6c4907f81b92b789e7d39d78d239ab638c
456+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.3@sha256:b0bd59748cda4a7abf311e4f448e6c1d00c6b6d8c0ecc1c2eb33e08dc0e0b802
463457
- name: kind
464458
value: task
465459
resolver: bundles
@@ -511,7 +505,7 @@ spec:
511505
- name: name
512506
value: sast-unicode-check-oci-ta
513507
- name: bundle
514-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.2@sha256:3f99dc4634a62e1530324cd565d12323ca82be3cfa8a031a36b210becfa7b552
508+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.3@sha256:a2bde66f6b4164620298c7d709b8f08515409404000fa1dc2260d2508b135651
515509
- name: kind
516510
value: task
517511
resolver: bundles
@@ -533,7 +527,7 @@ spec:
533527
- name: name
534528
value: apply-tags
535529
- name: bundle
536-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:e0de426d492e195f59c99d2ea1ca0df7bfb8c689f5d1468fe7f70eb8684b8d02
530+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
537531
- name: kind
538532
value: task
539533
resolver: bundles
@@ -556,7 +550,7 @@ spec:
556550
- name: name
557551
value: push-dockerfile-oci-ta
558552
- name: bundle
559-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:235ef6e835de8171c07b8a7f8947d0b40bfcff999e1ff3cb6ddd9acc65c48430
553+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:49f778479f468e71c2cfef722e96aa813d7ef98bde8a612e1bf1a13cd70849ec
560554
- name: kind
561555
value: task
562556
resolver: bundles

0 commit comments

Comments
 (0)