Skip to content

Commit 2b7c26c

Browse files
Update Konflux references
Signed-off-by: konflux-internal-p02 <170854209+konflux-internal-p02[bot]@users.noreply.github.com>
1 parent 04f9a80 commit 2b7c26c

File tree

3 files changed

+81
-63
lines changed

3 files changed

+81
-63
lines changed

.tekton/multiarch-push-pipeline.yaml

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,10 @@ spec:
120120
default: docker
121121
type: string
122122
description: The format for the resulting image's mediaType. Valid values are oci or docker.
123+
- name: enable-cache-proxy
124+
default: 'false'
125+
description: Enable cache proxy configuration
126+
type: string
123127
results:
124128
- description: ""
125129
name: IMAGE_URL
@@ -178,12 +182,14 @@ spec:
178182
value: $(params.rebuild)
179183
- name: skip-checks
180184
value: $(params.skip-checks)
185+
- name: enable-cache-proxy
186+
value: $(params.enable-cache-proxy)
181187
taskRef:
182188
params:
183189
- name: name
184190
value: init
185191
- name: bundle
186-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
192+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
187193
- name: kind
188194
value: task
189195
resolver: bundles
@@ -206,7 +212,7 @@ spec:
206212
- name: name
207213
value: git-clone-oci-ta
208214
- name: bundle
209-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
215+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:56f65a16d3d0485c64ad85af2c1f3e9b0bb4d02d63f2fd0ebb9498d219ca723d
210216
- name: kind
211217
value: task
212218
resolver: bundles
@@ -235,7 +241,7 @@ spec:
235241
- name: name
236242
value: prefetch-dependencies-oci-ta
237243
- name: bundle
238-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
244+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:36207773434bfad80fc3991d3ccca409d8429dbf5974c4dcd8d54145235b4b7b
239245
- name: kind
240246
value: task
241247
resolver: bundles
@@ -280,14 +286,18 @@ spec:
280286
value: "true"
281287
- name: BUILDAH_FORMAT
282288
value: $(params.buildah-format)
289+
- name: HTTP_PROXY
290+
value: $(tasks.init.results.http-proxy)
291+
- name: NO_PROXY
292+
value: $(tasks.init.results.no-proxy)
283293
runAfter:
284294
- prefetch-dependencies
285295
taskRef:
286296
params:
287297
- name: name
288298
value: buildah-remote-oci-ta
289299
- name: bundle
290-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.6@sha256:17b267b5ae3deca5905d930e54337b89df45d3579f33b7fab4df74ee644cded4
300+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.7@sha256:d8b2cd0bd3f8e3fdcafe4aebfee59f3f2fcbca78ef31f9c5dd8ecd781cd02636
291301
- name: kind
292302
value: task
293303
resolver: bundles
@@ -318,7 +328,7 @@ spec:
318328
- name: name
319329
value: build-image-index
320330
- name: bundle
321-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
331+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:985d1efe861b02524a7679ecd855624b3d4e3a2e835b6f8a97ec7d135898ec0b
322332
- name: kind
323333
value: task
324334
resolver: bundles
@@ -344,7 +354,7 @@ spec:
344354
- name: name
345355
value: source-build-oci-ta
346356
- name: bundle
347-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
357+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:c35ba219390d77a48ee19347e5ee8d13e5c23e3984299e02291d6da1ed8a986c
348358
- name: kind
349359
value: task
350360
resolver: bundles
@@ -370,7 +380,7 @@ spec:
370380
- name: name
371381
value: deprecated-image-check
372382
- name: bundle
373-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
383+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:808fe09bb5b8503de569de097ae5dd619a7488110f79e8e215e69862ee3fce6d
374384
- name: kind
375385
value: task
376386
resolver: bundles
@@ -397,7 +407,7 @@ spec:
397407
- name: name
398408
value: clair-scan
399409
- name: bundle
400-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
410+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:7c2a32de9021f16f6e8df08a55f539f12e00ea4d96f6fb37f9ea04167032c61f
401411
- name: kind
402412
value: task
403413
resolver: bundles
@@ -417,7 +427,7 @@ spec:
417427
- name: name
418428
value: ecosystem-cert-preflight-checks
419429
- name: bundle
420-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
430+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
421431
- name: kind
422432
value: task
423433
resolver: bundles
@@ -443,7 +453,7 @@ spec:
443453
- name: name
444454
value: sast-snyk-check-oci-ta
445455
- name: bundle
446-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8ad28b7783837a24acbc9a8494c935e796e591ce476085ad5899bebd7e53f077
456+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:0eca130f289a1a1069a1b92943479f79aa7324e4e68d6396fd777ccd97058f50
447457
- name: kind
448458
value: task
449459
resolver: bundles
@@ -608,7 +618,7 @@ spec:
608618
- name: name
609619
value: apply-tags
610620
- name: bundle
611-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
621+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:c89cd10b2a3f4c43789c5f06ef2b86f528b28f156c20af5e751fa8c0facd457d
612622
- name: kind
613623
value: task
614624
resolver: bundles
@@ -631,7 +641,7 @@ spec:
631641
- name: name
632642
value: push-dockerfile-oci-ta
633643
- name: bundle
634-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
644+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
635645
- name: kind
636646
value: task
637647
resolver: bundles
@@ -648,7 +658,7 @@ spec:
648658
- name: name
649659
value: rpms-signature-scan
650660
- name: bundle
651-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:1b6c20ab3dbfb0972803d3ebcb2fa72642e59400c77bd66dfd82028bdd09e120
661+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:0b10508c82ccb0f5a06a66ce7af56e9bfd40651ddefdf0f499988e897771ee28
652662
- name: kind
653663
value: task
654664
resolver: bundles

.tekton/odh-workbench-rstudio-minimal-cpu-py312-rhel9-poc-push.yaml

Lines changed: 29 additions & 25 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-
== "R-studio-konflux-poc"
12-
creationTimestamp: null
10+
pipelinesascode.tekton.dev/on-cel-expression: event == "push" && target_branch == "R-studio-konflux-poc"
11+
creationTimestamp:
1312
labels:
1413
appstudio.openshift.io/application: rstudio-poc
1514
appstudio.openshift.io/component: odh-workbench-rstudio-minimal-cpu-py312-rhel9-poc
@@ -54,13 +53,11 @@ spec:
5453
name: output-image
5554
type: string
5655
- default: .
57-
description: Path to the source code of an application's component from where
58-
to build image.
56+
description: Path to the source code of an application's component from where to build image.
5957
name: path-context
6058
type: string
6159
- default: Dockerfile
62-
description: Path to the Dockerfile inside the context specified by parameter
63-
path-context
60+
description: Path to the Dockerfile inside the context specified by parameter path-context
6461
name: dockerfile
6562
type: string
6663
- default: "false"
@@ -80,8 +77,7 @@ spec:
8077
name: prefetch-input
8178
type: string
8279
- default: ""
83-
description: Image tag expiration time, time values could be something like
84-
1h, 2d, 3w for hours, days, and weeks, respectively.
80+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
8581
name: image-expires-after
8682
type: string
8783
- default: "false"
@@ -93,8 +89,7 @@ spec:
9389
name: build-image-index
9490
type: string
9591
- default: docker
96-
description: The format for the resulting image's mediaType. Valid values are
97-
oci or docker.
92+
description: The format for the resulting image's mediaType. Valid values are oci or docker.
9893
name: buildah-format
9994
type: string
10095
- default: []
@@ -106,10 +101,13 @@ spec:
106101
name: build-args-file
107102
type: string
108103
- default: "false"
109-
description: Whether to enable privileged mode, should be used only with remote
110-
VMs
104+
description: Whether to enable privileged mode, should be used only with remote VMs
111105
name: privileged-nested
112106
type: string
107+
- name: enable-cache-proxy
108+
default: 'false'
109+
description: Enable cache proxy configuration
110+
type: string
113111
results:
114112
- description: ""
115113
name: IMAGE_URL
@@ -132,12 +130,14 @@ spec:
132130
value: $(params.rebuild)
133131
- name: skip-checks
134132
value: $(params.skip-checks)
133+
- name: enable-cache-proxy
134+
value: $(params.enable-cache-proxy)
135135
taskRef:
136136
params:
137137
- name: name
138138
value: init
139139
- name: bundle
140-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:3ca52e1d8885fc229bd9067275f44d5b21a9a609981d0324b525ddeca909bf10
140+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:b349d24cb896573695802d6913d311640b44675ec082b3ad167721946a6a0a71
141141
- name: kind
142142
value: task
143143
resolver: bundles
@@ -158,7 +158,7 @@ spec:
158158
- name: name
159159
value: git-clone-oci-ta
160160
- name: bundle
161-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:3dc39eae48745a96097c07c577b944d6203a91c35d3f71d9ed5feab41d327a6a
161+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:56f65a16d3d0485c64ad85af2c1f3e9b0bb4d02d63f2fd0ebb9498d219ca723d
162162
- name: kind
163163
value: task
164164
resolver: bundles
@@ -187,7 +187,7 @@ spec:
187187
- name: name
188188
value: prefetch-dependencies-oci-ta
189189
- name: bundle
190-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:5946ca57aa29f162e11b74984ec58960f55f9fb6a0e97c6c9215c4161f768726
190+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:36207773434bfad80fc3991d3ccca409d8429dbf5974c4dcd8d54145235b4b7b
191191
- name: kind
192192
value: task
193193
resolver: bundles
@@ -227,14 +227,18 @@ spec:
227227
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
228228
- name: CACHI2_ARTIFACT
229229
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
230+
- name: HTTP_PROXY
231+
value: $(tasks.init.results.http-proxy)
232+
- name: NO_PROXY
233+
value: $(tasks.init.results.no-proxy)
230234
runAfter:
231235
- prefetch-dependencies
232236
taskRef:
233237
params:
234238
- name: name
235239
value: buildah-oci-ta
236240
- name: bundle
237-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.6@sha256:27b04ea788cf64fd38c7d151feb5e1ca408804fa5a70cf704ae746a086ee92b8
241+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.7@sha256:7d5818e082e5534cf63946c1a1d380c0ee6b10b5c915340368c9ca081b97c02a
238242
- name: kind
239243
value: task
240244
resolver: bundles
@@ -265,7 +269,7 @@ spec:
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:31197f4ee71be47c6f491e888ff266cbbb8ad5ed1c7c4141cc14f002d1802a50
272+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:985d1efe861b02524a7679ecd855624b3d4e3a2e835b6f8a97ec7d135898ec0b
269273
- name: kind
270274
value: task
271275
resolver: bundles
@@ -291,7 +295,7 @@ spec:
291295
- name: name
292296
value: source-build-oci-ta
293297
- name: bundle
294-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:282cb5a9119a87e88559444feff67d76d6f356d03654b4845632c049b2314735
298+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:c35ba219390d77a48ee19347e5ee8d13e5c23e3984299e02291d6da1ed8a986c
295299
- name: kind
296300
value: task
297301
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:462baed733dfc38aca5395499e92f19b6f13a74c2e88fe5d86c3cffa2f899b57
324+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:808fe09bb5b8503de569de097ae5dd619a7488110f79e8e215e69862ee3fce6d
321325
- name: kind
322326
value: task
323327
resolver: bundles
@@ -339,7 +343,7 @@ spec:
339343
- name: name
340344
value: clair-scan
341345
- name: bundle
342-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8ec7d7b9438ace5ef3fb03a533d9440d0fd81e51c73b0dc1eb51602fb7cd044e
346+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:7c2a32de9021f16f6e8df08a55f539f12e00ea4d96f6fb37f9ea04167032c61f
343347
- name: kind
344348
value: task
345349
resolver: bundles
@@ -359,7 +363,7 @@ spec:
359363
- name: name
360364
value: ecosystem-cert-preflight-checks
361365
- name: bundle
362-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:9568c51a5158d534248908b9b561cf67d2826ed4ea164ffd95628bb42380e6ec
366+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:04f75593558f79a27da2336400bc63d460bf0c5669e3c13f40ee2fb650b1ad1e
363367
- name: kind
364368
value: task
365369
resolver: bundles
@@ -385,7 +389,7 @@ spec:
385389
- name: name
386390
value: sast-snyk-check-oci-ta
387391
- name: bundle
388-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8ad28b7783837a24acbc9a8494c935e796e591ce476085ad5899bebd7e53f077
392+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:0eca130f289a1a1069a1b92943479f79aa7324e4e68d6396fd777ccd97058f50
389393
- name: kind
390394
value: task
391395
resolver: bundles
@@ -547,7 +551,7 @@ spec:
547551
- name: name
548552
value: apply-tags
549553
- name: bundle
550-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:4c2b0a2d2904108f8d19edfa878df6cd49ed19aab73ab6fc6a435fba0265f771
554+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:c89cd10b2a3f4c43789c5f06ef2b86f528b28f156c20af5e751fa8c0facd457d
551555
- name: kind
552556
value: task
553557
resolver: bundles
@@ -570,7 +574,7 @@ spec:
570574
- name: name
571575
value: push-dockerfile-oci-ta
572576
- name: bundle
573-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:13633d5ba8445c0f732a0a5d1b33ffbb708398e45ef1647542b0ab22fee25a6a
577+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:08bba4a659ecd48f871bef00b80af58954e5a09fcbb28a1783ddd640c4f6535e
574578
- name: kind
575579
value: task
576580
resolver: bundles

0 commit comments

Comments
 (0)