Skip to content

Commit 0cbc2f0

Browse files
authored
chore: Update Konflux pipelines (#1881)
1 parent 94555e5 commit 0cbc2f0

File tree

1 file changed

+21
-22
lines changed

1 file changed

+21
-22
lines changed

.tekton/collector-component-pipeline.yaml

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- name: show-sbom
3131
params:
3232
- name: IMAGE_URL
33-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
33+
value: $(tasks.build-image-index.results.IMAGE_URL)
3434
taskRef:
3535
params:
3636
- name: name
@@ -86,8 +86,7 @@ spec:
8686
description: Java build
8787
name: java
8888
type: string
89-
- default: ""
90-
description: Image tag expiration time, time values could be something like
89+
- description: Image tag expiration time, time values could be something like
9190
1h, 2d, 3w for hours, days, and weeks, respectively.
9291
name: image-expires-after
9392
type: string
@@ -110,10 +109,10 @@ spec:
110109
results:
111110
- description: ""
112111
name: IMAGE_URL
113-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
112+
value: $(tasks.build-image-index.results.IMAGE_URL)
114113
- description: ""
115114
name: IMAGE_DIGEST
116-
value: $(tasks.build-image-manifest.results.IMAGE_DIGEST)
115+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
117116
- description: ""
118117
name: CHAINS-GIT_URL
119118
value: $(tasks.clone-repository.results.url)
@@ -134,7 +133,7 @@ spec:
134133
- name: image-url
135134
# We can't provide a StackRox-style tag because it is not known at this time (requires cloning source, etc.)
136135
# As a workaround, we still provide a unique tag that's based on a revision to this task to comply with its
137-
# expected input. We later actually add this tag on a built image with build-image-manifest-extra task.
136+
# expected input. We later actually add this tag on a built image with build-image-index-extra task.
138137
value: $(params.output-image-repo):konflux-$(params.revision)
139138
- name: rebuild
140139
value: $(params.rebuild)
@@ -383,7 +382,7 @@ spec:
383382
values: [ "true" ]
384383
timeout: 1h30m0s
385384

386-
- name: build-image-manifest
385+
- name: build-image-index
387386
params:
388387
- name: IMAGE
389388
value: $(params.output-image-repo):$(tasks.determine-image-tag.results.IMAGE_TAG)
@@ -398,9 +397,9 @@ spec:
398397
taskRef:
399398
params:
400399
- name: name
401-
value: build-image-manifest
400+
value: build-image-index
402401
- name: bundle
403-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-manifest:0.1@sha256:56c8236523509b8669755e725fb6c0c5810fa49431e14da8a3a0b36ff1fde448
402+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:e4871851566d8b496966b37bcb8c5ce9748a52487f116373d96c6cd28ef684c6
404403
- name: kind
405404
value: task
406405
resolver: bundles
@@ -409,7 +408,7 @@ spec:
409408
operator: in
410409
values: [ "true" ]
411410

412-
- name: build-image-manifest-extra
411+
- name: build-image-index-extra
413412
matrix:
414413
params:
415414
- name: IMAGE
@@ -429,9 +428,9 @@ spec:
429428
taskRef:
430429
params:
431430
- name: name
432-
value: build-image-manifest
431+
value: build-image-index
433432
- name: bundle
434-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-manifest:0.1@sha256:56c8236523509b8669755e725fb6c0c5810fa49431e14da8a3a0b36ff1fde448
433+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.1@sha256:e4871851566d8b496966b37bcb8c5ce9748a52487f116373d96c6cd28ef684c6
435434
- name: kind
436435
value: task
437436
resolver: bundles
@@ -443,7 +442,7 @@ spec:
443442
- name: build-source-image
444443
params:
445444
- name: BINARY_IMAGE
446-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
445+
value: $(tasks.build-image-index.results.IMAGE_URL)
447446
- name: SOURCE_ARTIFACT
448447
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
449448
- name: CACHI2_ARTIFACT
@@ -468,9 +467,9 @@ spec:
468467
- name: deprecated-base-image-check
469468
params:
470469
- name: IMAGE_URL
471-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
470+
value: $(tasks.build-image-index.results.IMAGE_URL)
472471
- name: IMAGE_DIGEST
473-
value: $(tasks.build-image-manifest.results.IMAGE_DIGEST)
472+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
474473
taskRef:
475474
params:
476475
- name: name
@@ -488,9 +487,9 @@ spec:
488487
- name: clair-scan
489488
params:
490489
- name: image-digest
491-
value: $(tasks.build-image-manifest.results.IMAGE_DIGEST)
490+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
492491
- name: image-url
493-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
492+
value: $(tasks.build-image-index.results.IMAGE_URL)
494493
taskRef:
495494
params:
496495
- name: name
@@ -508,7 +507,7 @@ spec:
508507
- name: ecosystem-cert-preflight-checks
509508
params:
510509
- name: image-url
511-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
510+
value: $(tasks.build-image-index.results.IMAGE_URL)
512511
taskRef:
513512
params:
514513
- name: name
@@ -528,9 +527,9 @@ spec:
528527
- name: SOURCE_ARTIFACT
529528
value: $(tasks.prefetch-dependencies.results.SOURCE_ARTIFACT)
530529
- name: image-digest
531-
value: $(tasks.build-image-manifest.results.IMAGE_DIGEST)
530+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
532531
- name: image-url
533-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
532+
value: $(tasks.build-image-index.results.IMAGE_URL)
534533
taskRef:
535534
params:
536535
- name: name
@@ -548,9 +547,9 @@ spec:
548547
- name: clamav-scan
549548
params:
550549
- name: image-digest
551-
value: $(tasks.build-image-manifest.results.IMAGE_DIGEST)
550+
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
552551
- name: image-url
553-
value: $(tasks.build-image-manifest.results.IMAGE_URL)
552+
value: $(tasks.build-image-index.results.IMAGE_URL)
554553
taskRef:
555554
params:
556555
- name: name

0 commit comments

Comments
 (0)