Skip to content

Commit 0c4d495

Browse files
Merge pull request #3122 from openshift/konflux/references/release-4.18
[release-4.18] Update Konflux references
2 parents b9bb943 + 105390a commit 0c4d495

4 files changed

+70
-78
lines changed

.tekton/windows-machine-config-operator-bundle-release-4-18-pull-request.yaml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
event == "pull_request"
1212
&& target_branch == "release-4.18"
1313
&& ( "Containerfile.bundle".pathChanged() || "bundle/***".pathChanged() || ".tekton/windows-machine-config-operator-bundle-*".pathChanged() )
14-
creationTimestamp: null
14+
creationTimestamp:
1515
labels:
1616
appstudio.openshift.io/application: windows-machine-config-operator-release-4-18
1717
appstudio.openshift.io/component: windows-machine-config-operator-bundle-release-4-18
@@ -47,7 +47,7 @@ spec:
4747
- name: name
4848
value: show-sbom
4949
- name: bundle
50-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:1b1df4da95966d08ac6a5b8198710e09e68b5c2cdc707c37d9d19769e65884b2
50+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:86c069cac0a669797e8049faa8aa4088e70ff7fcd579d5bdc37626a9e0488a05
5151
- name: kind
5252
value: task
5353
resolver: bundles
@@ -63,13 +63,11 @@ spec:
6363
name: output-image
6464
type: string
6565
- default: .
66-
description: Path to the source code of an application's component from where
67-
to build image.
66+
description: Path to the source code of an application's component from where to build image.
6867
name: path-context
6968
type: string
7069
- default: Dockerfile
71-
description: Path to the Dockerfile inside the context specified by parameter
72-
path-context
70+
description: Path to the Dockerfile inside the context specified by parameter path-context
7371
name: dockerfile
7472
type: string
7573
- default: "false"
@@ -93,16 +91,14 @@ spec:
9391
name: java
9492
type: string
9593
- default: ""
96-
description: Image tag expiration time, time values could be something like
97-
1h, 2d, 3w for hours, days, and weeks, respectively.
94+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
9895
name: image-expires-after
9996
- default: "false"
10097
description: Build a source image.
10198
name: build-source-image
10299
type: string
103100
- default: ""
104-
description: Path to a file with build arguments which will be passed to podman
105-
during build
101+
description: Path to a file with build arguments which will be passed to podman during build
106102
name: build-args-file
107103
type: string
108104
results:
@@ -132,7 +128,7 @@ spec:
132128
- name: name
133129
value: init
134130
- name: bundle
135-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:66e90d31e1386bf516fb548cd3e3f0082b5d0234b8b90dbf9e0d4684b70dbe1a
131+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:1d8221c84f91b923d89de50bf16481ea729e3b68ea04a9a7cbe8485ddbb27ee6
136132
- name: kind
137133
value: task
138134
resolver: bundles
@@ -182,7 +178,7 @@ spec:
182178
- name: name
183179
value: prefetch-dependencies-oci-ta
184180
- name: bundle
185-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:a1ddc34bf0a169bb2e64a98caf9027b66af8fc66a3a60f71bb451ce36af6a399
181+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:092491ac0f6e1009d10c58a1319d1029371bf637cc1293cceba53c6da5314ed1
186182
- name: kind
187183
value: task
188184
resolver: bundles
@@ -218,7 +214,7 @@ spec:
218214
- name: name
219215
value: buildah-oci-ta
220216
- name: bundle
221-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:48b99ad18fd3bde2d22ec2c397d36c55e45ca90ddf1620c9e00bdee518e297bf
217+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:9e9bac2044d6231b44114046b9d528c135388699365f0f210ee810c01bd4d702
222218
- name: kind
223219
value: task
224220
resolver: bundles
@@ -230,19 +226,21 @@ spec:
230226
- name: build-source-image
231227
params:
232228
- name: BINARY_IMAGE
233-
value: $(params.output-image)
229+
value: $(tasks.build-container.results.IMAGE_URL)
234230
- name: SOURCE_ARTIFACT
235231
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
236232
- name: CACHI2_ARTIFACT
237233
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
234+
- name: BINARY_IMAGE_DIGEST
235+
value: $(tasks.build-container.results.IMAGE_DIGEST)
238236
runAfter:
239237
- build-container
240238
taskRef:
241239
params:
242240
- name: name
243241
value: source-build-oci-ta
244242
- name: bundle
245-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:b424894fc8e806c12658daa565b835fd2d66e7f7608afc47529eb7b410f030d7
243+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
246244
- name: kind
247245
value: task
248246
resolver: bundles
@@ -314,7 +312,7 @@ spec:
314312
- name: name
315313
value: clair-scan
316314
- name: bundle
317-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:d354939892f3a904223ec080cc3771bd11931085a5d202323ea491ee8e8c5e43
315+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
318316
- name: kind
319317
value: task
320318
resolver: bundles
@@ -340,7 +338,7 @@ spec:
340338
- name: name
341339
value: sast-snyk-check-oci-ta
342340
- name: bundle
343-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e61f541189b30d14292ef8df36ccaf13f7feb2378fed5f74cb6293b3e79eb687
341+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
344342
- name: kind
345343
value: task
346344
resolver: bundles
@@ -366,7 +364,7 @@ spec:
366364
- name: name
367365
value: sast-shell-check-oci-ta
368366
- name: bundle
369-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:808bcaf75271db6a999f53fdefb973a385add94a277d37fbd3df68f8ac7dfaa3
367+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
370368
- name: kind
371369
value: task
372370
resolver: bundles
@@ -414,7 +412,7 @@ spec:
414412
- name: name
415413
value: clamav-scan
416414
- name: bundle
417-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:9cab95ac9e833d77a63c079893258b73b8d5a298d93aaf9bdd6722471bc2f338
415+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7749146f7e4fe530846f1b15c9366178ec9f44776ef1922a60d3e7e2b8c6426b
418416
- name: kind
419417
value: task
420418
resolver: bundles

.tekton/windows-machine-config-operator-bundle-release-4-18-push.yaml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ metadata:
1010
event == "push"
1111
&& target_branch == "release-4.18"
1212
&& ( "Containerfile.bundle".pathChanged() || "bundle/***".pathChanged() || ".tekton/windows-machine-config-operator-bundle-*".pathChanged() )
13-
creationTimestamp: null
13+
creationTimestamp:
1414
labels:
1515
appstudio.openshift.io/application: windows-machine-config-operator-release-4-18
1616
appstudio.openshift.io/component: windows-machine-config-operator-bundle-release-4-18
@@ -44,7 +44,7 @@ spec:
4444
- name: name
4545
value: show-sbom
4646
- name: bundle
47-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:1b1df4da95966d08ac6a5b8198710e09e68b5c2cdc707c37d9d19769e65884b2
47+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:86c069cac0a669797e8049faa8aa4088e70ff7fcd579d5bdc37626a9e0488a05
4848
- name: kind
4949
value: task
5050
resolver: bundles
@@ -60,13 +60,11 @@ spec:
6060
name: output-image
6161
type: string
6262
- default: .
63-
description: Path to the source code of an application's component from where
64-
to build image.
63+
description: Path to the source code of an application's component from where to build image.
6564
name: path-context
6665
type: string
6766
- default: Dockerfile
68-
description: Path to the Dockerfile inside the context specified by parameter
69-
path-context
67+
description: Path to the Dockerfile inside the context specified by parameter path-context
7068
name: dockerfile
7169
type: string
7270
- default: "false"
@@ -90,16 +88,14 @@ spec:
9088
name: java
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
- default: "false"
9794
description: Build a source image.
9895
name: build-source-image
9996
type: string
10097
- default: ""
101-
description: Path to a file with build arguments which will be passed to podman
102-
during build
98+
description: Path to a file with build arguments which will be passed to podman during build
10399
name: build-args-file
104100
type: string
105101
results:
@@ -129,7 +125,7 @@ spec:
129125
- name: name
130126
value: init
131127
- name: bundle
132-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:66e90d31e1386bf516fb548cd3e3f0082b5d0234b8b90dbf9e0d4684b70dbe1a
128+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:1d8221c84f91b923d89de50bf16481ea729e3b68ea04a9a7cbe8485ddbb27ee6
133129
- name: kind
134130
value: task
135131
resolver: bundles
@@ -179,7 +175,7 @@ spec:
179175
- name: name
180176
value: prefetch-dependencies-oci-ta
181177
- name: bundle
182-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:a1ddc34bf0a169bb2e64a98caf9027b66af8fc66a3a60f71bb451ce36af6a399
178+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:092491ac0f6e1009d10c58a1319d1029371bf637cc1293cceba53c6da5314ed1
183179
- name: kind
184180
value: task
185181
resolver: bundles
@@ -215,7 +211,7 @@ spec:
215211
- name: name
216212
value: buildah-oci-ta
217213
- name: bundle
218-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:48b99ad18fd3bde2d22ec2c397d36c55e45ca90ddf1620c9e00bdee518e297bf
214+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-oci-ta:0.4@sha256:9e9bac2044d6231b44114046b9d528c135388699365f0f210ee810c01bd4d702
219215
- name: kind
220216
value: task
221217
resolver: bundles
@@ -227,19 +223,21 @@ spec:
227223
- name: build-source-image
228224
params:
229225
- name: BINARY_IMAGE
230-
value: $(params.output-image)
226+
value: $(tasks.build-container.results.IMAGE_URL)
231227
- name: SOURCE_ARTIFACT
232228
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
233229
- name: CACHI2_ARTIFACT
234230
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
231+
- name: BINARY_IMAGE_DIGEST
232+
value: $(tasks.build-container.results.IMAGE_DIGEST)
235233
runAfter:
236234
- build-container
237235
taskRef:
238236
params:
239237
- name: name
240238
value: source-build-oci-ta
241239
- name: bundle
242-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.2@sha256:b424894fc8e806c12658daa565b835fd2d66e7f7608afc47529eb7b410f030d7
240+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:b1eb49583b41872b27356fee20d5f0eb6ff7f5cdeacde7ffb39655f031104728
243241
- name: kind
244242
value: task
245243
resolver: bundles
@@ -311,7 +309,7 @@ spec:
311309
- name: name
312310
value: clair-scan
313311
- name: bundle
314-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:d354939892f3a904223ec080cc3771bd11931085a5d202323ea491ee8e8c5e43
312+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:417f44117f8d87a4a62fea6589b5746612ac61640b454dbd88f74892380411f2
315313
- name: kind
316314
value: task
317315
resolver: bundles
@@ -337,7 +335,7 @@ spec:
337335
- name: name
338336
value: sast-snyk-check-oci-ta
339337
- name: bundle
340-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e61f541189b30d14292ef8df36ccaf13f7feb2378fed5f74cb6293b3e79eb687
338+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:fe5e5ba3a72632cd505910de2eacd62c9d11ed570c325173188f8d568ac60771
341339
- name: kind
342340
value: task
343341
resolver: bundles
@@ -363,7 +361,7 @@ spec:
363361
- name: name
364362
value: sast-shell-check-oci-ta
365363
- name: bundle
366-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:808bcaf75271db6a999f53fdefb973a385add94a277d37fbd3df68f8ac7dfaa3
364+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:bf7bdde00b7212f730c1356672290af6f38d070da2c8a316987b5c32fd49e0b9
367365
- name: kind
368366
value: task
369367
resolver: bundles
@@ -411,7 +409,7 @@ spec:
411409
- name: name
412410
value: clamav-scan
413411
- name: bundle
414-
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:9cab95ac9e833d77a63c079893258b73b8d5a298d93aaf9bdd6722471bc2f338
412+
value: quay.io/konflux-ci/tekton-catalog/task-clamav-scan:0.2@sha256:7749146f7e4fe530846f1b15c9366178ec9f44776ef1922a60d3e7e2b8c6426b
415413
- name: kind
416414
value: task
417415
resolver: bundles

0 commit comments

Comments
 (0)