Skip to content

Commit 2d13c2c

Browse files
committed
Update the latest tekton changes
1 parent a801dba commit 2d13c2c

File tree

2 files changed

+148
-176
lines changed

2 files changed

+148
-176
lines changed

.tekton/kube-descheduler-operator-fbc-4-16-pull-request.yaml

Lines changed: 74 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
build.appstudio.redhat.com/commit_sha: '{{revision}}'
77
build.appstudio.redhat.com/pull_request_number: '{{pull_request_number}}'
88
build.appstudio.redhat.com/target_branch: '{{target_branch}}'
9+
pipelinesascode.tekton.dev/cancel-in-progress: "true"
910
pipelinesascode.tekton.dev/max-keep-runs: "3"
1011
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request" && target_branch
1112
== "fbc-4.16" && ( "v4.16/***".pathChanged() || ".tekton/kube-descheduler-operator-fbc-4-16-pull-request.yaml".pathChanged()
@@ -27,16 +28,16 @@ spec:
2728
value: quay.io/redhat-user-workloads/kdo-workloads-tenant/kube-descheduler-operator-fbc-4-16:on-pr-{{revision}}
2829
- name: image-expires-after
2930
value: 5d
30-
- name: dockerfile
31-
value: catalog.Dockerfile
32-
- name: path-context
33-
value: v4.16
3431
- name: build-platforms
3532
value:
3633
- linux/x86_64
3734
- linux/arm64
3835
- linux/ppc64le
3936
- linux/s390x
37+
- name: dockerfile
38+
value: catalog.Dockerfile
39+
- name: path-context
40+
value: v4.16
4041
pipelineSpec:
4142
description: |
4243
This pipeline is ideal for building and verifying [file-based catalogs](https://konflux-ci.dev/docs/advanced-how-tos/building-olm.adoc#building-the-file-based-catalog).
@@ -53,7 +54,7 @@ spec:
5354
- name: name
5455
value: show-sbom
5556
- name: bundle
56-
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:945a7c9066d3e0a95d3fddb7e8a6992e4d632a2a75d8f3a9bd2ff2fef0ec9aa0
57+
value: quay.io/konflux-ci/tekton-catalog/task-show-sbom:0.1@sha256:002f7c8c1d2f9e09904035da414aba1188ae091df0ea9532cd997be05e73d594
5758
- name: kind
5859
value: task
5960
resolver: bundles
@@ -106,6 +107,14 @@ spec:
106107
description: Add built image into an OCI image index
107108
name: build-image-index
108109
type: string
110+
- default: []
111+
description: Array of --build-arg values ("arg=value" strings) for buildah
112+
name: build-args
113+
type: array
114+
- default: ""
115+
description: Path to a file with build arguments for buildah, see https://www.mankier.com/1/buildah-build#--build-arg-file
116+
name: build-args-file
117+
type: string
109118
- default:
110119
- linux/x86_64
111120
- linux/arm64
@@ -142,7 +151,7 @@ spec:
142151
- name: name
143152
value: init
144153
- name: bundle
145-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:0523b51c28375a3f222da91690e22eff11888ebc98a0c73c468af44762265c69
154+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:7a24924417260b7094541caaedd2853dc8da08d4bb0968f710a400d3e8062063
146155
- name: kind
147156
value: task
148157
resolver: bundles
@@ -163,7 +172,7 @@ spec:
163172
- name: name
164173
value: git-clone-oci-ta
165174
- name: bundle
166-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:4bf48d038ff12d25bdeb5ab3e98dc2271818056f454c83d7393ebbd413028147
175+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:8ecf57d5a6697ce709bee65b62781efe79a10b0c2b95e05576442b67fbd61744
167176
- name: kind
168177
value: task
169178
resolver: bundles
@@ -175,6 +184,32 @@ spec:
175184
workspaces:
176185
- name: basic-auth
177186
workspace: git-auth
187+
- name: prefetch-dependencies
188+
params:
189+
- name: input
190+
value: $(params.prefetch-input)
191+
- name: SOURCE_ARTIFACT
192+
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
193+
- name: ociStorage
194+
value: $(params.output-image).prefetch
195+
- name: ociArtifactExpiresAfter
196+
value: $(params.image-expires-after)
197+
runAfter:
198+
- clone-repository
199+
taskRef:
200+
params:
201+
- name: name
202+
value: prefetch-dependencies-oci-ta
203+
- name: bundle
204+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d48c621ae828a3cbca162e12ec166210d2d77a7ba23b0e5d60c4a1b94491adeb
205+
- name: kind
206+
value: task
207+
resolver: bundles
208+
workspaces:
209+
- name: git-basic-auth
210+
workspace: git-auth
211+
- name: netrc
212+
workspace: netrc
178213
- matrix:
179214
params:
180215
- name: PLATFORM
@@ -190,12 +225,21 @@ spec:
190225
value: $(params.path-context)
191226
- name: HERMETIC
192227
value: $(params.hermetic)
228+
- name: PREFETCH_INPUT
229+
value: $(params.prefetch-input)
193230
- name: IMAGE_EXPIRES_AFTER
194231
value: $(params.image-expires-after)
195232
- name: COMMIT_SHA
196233
value: $(tasks.clone-repository.results.commit)
234+
- name: BUILD_ARGS
235+
value:
236+
- $(params.build-args[*])
237+
- name: BUILD_ARGS_FILE
238+
value: $(params.build-args-file)
197239
- name: SOURCE_ARTIFACT
198-
value: $(tasks.clone-repository.results.SOURCE_ARTIFACT)
240+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
241+
- name: CACHI2_ARTIFACT
242+
value: $(tasks.prefetch-dependencies.results.CACHI2_ARTIFACT)
199243
- name: IMAGE_APPEND_PLATFORM
200244
value: "true"
201245
runAfter:
@@ -205,7 +249,7 @@ spec:
205249
- name: name
206250
value: buildah-remote-oci-ta
207251
- name: bundle
208-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.2@sha256:52a1a93cf99ab1f1092e983ac41b3684b7af004772d325e89b42e82e046bc7d1
252+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:6a5f714dd0c301ac421c232d2658e336b862681cf0bcbcbf01ef38d8969664e0
209253
- name: kind
210254
value: task
211255
resolver: bundles
@@ -234,7 +278,7 @@ spec:
234278
- name: name
235279
value: build-image-index
236280
- name: bundle
237-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:ebc17bb22481160eec6eb7277df1e48b90f599bebe563cd4f046807f4e32ced3
281+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:462ecbf94ec44a8b770d6ef8838955f91f57ee79795e5c18bdc0fcb0df593742
238282
- name: kind
239283
value: task
240284
resolver: bundles
@@ -243,30 +287,6 @@ spec:
243287
operator: in
244288
values:
245289
- "true"
246-
- name: fbc-fips-check-oci-ta
247-
params:
248-
- name: image-digest
249-
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
250-
- name: image-url
251-
value: $(tasks.build-image-index.results.IMAGE_URL)
252-
- name: SOURCE_ARTIFACT
253-
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
254-
runAfter:
255-
- build-image-index
256-
taskRef:
257-
params:
258-
- name: name
259-
value: fbc-fips-check-oci-ta
260-
- name: bundle
261-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:2e6900f5755fca70f8eebfcf004f39dd9adf6b488c8828f35a1b24862a9f81cf
262-
- name: kind
263-
value: task
264-
resolver: bundles
265-
when:
266-
- input: $(params.skip-checks)
267-
operator: in
268-
values:
269-
- "false"
270290
- name: deprecated-base-image-check
271291
params:
272292
- name: IMAGE_URL
@@ -280,7 +300,7 @@ spec:
280300
- name: name
281301
value: deprecated-image-check
282302
- name: bundle
283-
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.4@sha256:5a1a165fa02270f0a947d8a2131ee9d8be0b8e9d34123828c2bef589e504ee84
303+
value: quay.io/konflux-ci/tekton-catalog/task-deprecated-image-check:0.5@sha256:eb8136b543147b4a3e88ca3cc661ca6a11e303f35f0db44059f69151beea8496
284304
- name: kind
285305
value: task
286306
resolver: bundles
@@ -300,11 +320,11 @@ spec:
300320
- name: name
301321
value: apply-tags
302322
- name: bundle
303-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:87fd7fc0e937aad1a8db9b6e377d7e444f53394dafde512d68adbea6966a4702
323+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.1@sha256:3f89ba89cacf8547261b5ce064acce81bfe470c8ace127794d0e90aebc8c347d
304324
- name: kind
305325
value: task
306326
resolver: bundles
307-
- name: inspect-image
327+
- name: validate-fbc
308328
params:
309329
- name: IMAGE_URL
310330
value: $(tasks.build-image-index.results.IMAGE_URL)
@@ -315,9 +335,9 @@ spec:
315335
taskRef:
316336
params:
317337
- name: name
318-
value: inspect-image
338+
value: validate-fbc
319339
- name: bundle
320-
value: quay.io/konflux-ci/tekton-catalog/task-inspect-image:0.1@sha256:b4f8b61baf43ca503aae76078bb4cfe718ca21a5ab293d982978d6fd564bf1b6
340+
value: quay.io/konflux-ci/tekton-catalog/task-validate-fbc:0.1@sha256:30a5df9773eb9cab3efd808206370761302d4dc59dc5aa14e56b571c7daf9ee9
321341
- name: kind
322342
value: task
323343
resolver: bundles
@@ -326,25 +346,24 @@ spec:
326346
operator: in
327347
values:
328348
- "false"
329-
workspaces:
330-
- name: source
331-
workspace: workspace
332-
- name: fbc-validate
349+
- name: fbc-target-index-pruning-check
333350
params:
334351
- name: IMAGE_URL
335352
value: $(tasks.build-image-index.results.IMAGE_URL)
336353
- name: IMAGE_DIGEST
337354
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
338-
- name: BASE_IMAGE
339-
value: $(tasks.inspect-image.results.BASE_IMAGE)
355+
- name: TARGET_INDEX
356+
value: registry.redhat.io/redhat/redhat-operator-index
357+
- name: RENDERED_CATALOG_DIGEST
358+
value: $(tasks.validate-fbc.results.RENDERED_CATALOG_DIGEST)
340359
runAfter:
341-
- inspect-image
360+
- validate-fbc
342361
taskRef:
343362
params:
344363
- name: name
345-
value: fbc-validation
364+
value: fbc-target-index-pruning-check
346365
- name: bundle
347-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-validation:0.1@sha256:bf72968f8b36b92b4e8322f4208f20f07be1195be4551a7916d0b598c613ed4c
366+
value: quay.io/konflux-ci/tekton-catalog/task-fbc-target-index-pruning-check:0.1@sha256:a4d0bedb2aeed06d060b5a38f3dc020625e1c11665fc1a0317765c1f90edb485
348367
- name: kind
349368
value: task
350369
resolver: bundles
@@ -353,43 +372,22 @@ spec:
353372
operator: in
354373
values:
355374
- "false"
356-
workspaces:
357-
- name: workspace
358-
workspace: workspace
359-
- name: fbc-related-image-check
360-
runAfter:
361-
- fbc-validate
362-
taskRef:
363-
params:
364-
- name: name
365-
value: fbc-related-image-check
366-
- name: bundle
367-
value: quay.io/konflux-ci/tekton-catalog/task-fbc-related-image-check:0.1@sha256:17dc33ef07a8f87d1a8a2f6d4f496123e0db5d29bbe7ff7956462dc5d95c3170
368-
- name: kind
369-
value: task
370-
resolver: bundles
371-
when:
372-
- input: $(params.skip-checks)
373-
operator: in
374-
values:
375-
- "false"
376-
workspaces:
377-
- name: workspace
378-
workspace: workspace
379-
- name: rpms-signature-scan
375+
- name: fbc-fips-check-oci-ta
380376
params:
381-
- name: image-url
382-
value: $(tasks.build-image-index.results.IMAGE_URL)
383377
- name: image-digest
384378
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
379+
- name: image-url
380+
value: $(tasks.build-image-index.results.IMAGE_URL)
381+
- name: SOURCE_ARTIFACT
382+
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
385383
runAfter:
386384
- build-image-index
387385
taskRef:
388386
params:
389387
- name: name
390-
value: rpms-signature-scan
388+
value: fbc-fips-check-oci-ta
391389
- name: bundle
392-
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:28aaf87d61078a0aeeeabcae455eda7d05c4f9b81d8995bdcf3dde95c1a7a77b
390+
value: quay.io/konflux-ci/tekton-catalog/task-fbc-fips-check-oci-ta:0.1@sha256:2bc6985a2bd9379ddd3d0ce4343580517bb1a10ffdb7036aa3dd2bbe1943cc0a
393391
- name: kind
394392
value: task
395393
resolver: bundles
@@ -399,25 +397,13 @@ spec:
399397
values:
400398
- "false"
401399
workspaces:
402-
- name: workspace
403400
- name: git-auth
404401
optional: true
405402
- name: netrc
406403
optional: true
407404
taskRunTemplate:
408405
serviceAccountName: build-pipeline-kube-descheduler-operator-fbc-4-16
409406
workspaces:
410-
- name: workspace
411-
volumeClaimTemplate:
412-
metadata:
413-
creationTimestamp: null
414-
spec:
415-
accessModes:
416-
- ReadWriteOnce
417-
resources:
418-
requests:
419-
storage: 1Gi
420-
status: {}
421407
- name: git-auth
422408
secret:
423409
secretName: '{{ git_auth_secret }}'

0 commit comments

Comments
 (0)