Skip to content

Commit 76afa95

Browse files
simonbairdsimonbaird
authored
Merge pull request #3357 from simonbaird/konflux-task-refs-update-main
Konflux task refs and other dependency updates (main)
2 parents ac7089f + fc77635 commit 76afa95

19 files changed

Lines changed: 532 additions & 594 deletions

File tree

‎.github/workflows/checks-codecov.yaml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,8 +246,4 @@ jobs:
246246
cache: false
247247

248248
- name: Development tools can be run
249-
run: |
250-
go run -modfile tools/go.mod github.com/tektoncd/cli/cmd/tkn version
251-
go run -modfile tools/go.mod sigs.k8s.io/kustomize/kustomize/v5 version
252-
go run -modfile tools/go.mod helm.sh/helm/v3/cmd/helm version
253-
go run -modfile tools/go.mod github.com/open-policy-agent/conftest --version
249+
run: make tools-ci

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ spec:
137137
- name: name
138138
value: init
139139
- name: bundle
140-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:90f0e8e134c4bb919956bb095d62365907adeea4fbeb4cebbf5f3f94286bf967
140+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:5a423246792ac501ea279229b42ee57da9927da441c04b5c9ff86817b0856b08
141141
- name: kind
142142
value: task
143143
resolver: bundles
@@ -162,7 +162,7 @@ spec:
162162
- name: name
163163
value: git-clone-oci-ta
164164
- name: bundle
165-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:13d49df7dc9ae301627e45f95a236011422996152f1bea46cd60217b0f057407
165+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:e865b49436c38a0ce41c7d9e726143b2025dea23e9f782b4821f9db8a0e4b625
166166
- name: kind
167167
value: task
168168
resolver: bundles
@@ -188,7 +188,7 @@ spec:
188188
- name: name
189189
value: prefetch-dependencies-oci-ta
190190
- name: bundle
191-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:a2efbcdcecfa5293a622eb356a18f5c88e5714046b214fe8730b43b1a7dbb77d
191+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
192192
- name: kind
193193
value: task
194194
resolver: bundles
@@ -239,7 +239,7 @@ spec:
239239
- name: name
240240
value: buildah-remote-oci-ta
241241
- name: bundle
242-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
242+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:148347cf1a291bc3ebe0700d7f61c12f7f4d5e78e59a162f5e622ad67106c4a9
243243
- name: kind
244244
value: task
245245
resolver: bundles
@@ -263,7 +263,7 @@ spec:
263263
- name: name
264264
value: build-image-index
265265
- name: bundle
266-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:020a1b4126cc6b7c7a919c2b549b94e6b7b826aaaa0d0f2e67d1980df967e498
266+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:82bc4bdf4151d7d02e80dff07925433573f37c9a503cffa72071bd300c7f2f6c
267267
- name: kind
268268
value: task
269269
resolver: bundles
@@ -284,7 +284,7 @@ spec:
284284
- name: name
285285
value: source-build-oci-ta
286286
- name: bundle
287-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
287+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
288288
- name: kind
289289
value: task
290290
resolver: bundles
@@ -319,7 +319,7 @@ spec:
319319
- name: name
320320
value: tkn-bundle-oci-ta
321321
- name: bundle
322-
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:35ebaaa9ad1b44086f5d92805a5b2eaa8ff26cb9516b7212b64c6b0caf0b6440
322+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:9e5dce0c4b1808ef68ea2b5b77a67936576f82e5b773b5f8a3b7a7b494ebd94d
323323
- name: kind
324324
value: task
325325
resolver: bundles
@@ -363,7 +363,7 @@ spec:
363363
- name: name
364364
value: clair-scan
365365
- name: bundle
366-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
366+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
367367
- name: kind
368368
value: task
369369
resolver: bundles
@@ -383,7 +383,7 @@ spec:
383383
- name: name
384384
value: ecosystem-cert-preflight-checks
385385
- name: bundle
386-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:25dcef1d9270b2e03fe6710a733171f7c7208e341fc627dac3a579088f44af34
386+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:3c4f60ebda2225eff6a6bc387d9bbd443f1264d756bf385f97cc684992e904a0
387387
- name: kind
388388
value: task
389389
resolver: bundles
@@ -409,7 +409,7 @@ spec:
409409
- name: name
410410
value: sast-snyk-check-oci-ta
411411
- name: bundle
412-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8f3ecbeaff579e41b8278f82d7fabac27845db17a8e687ea6c510c0c9aceabbb
412+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8d794f3c04de1b47b76f9e48a2be19520568d8b467598976cbd440c44532f970
413413
- name: kind
414414
value: task
415415
resolver: bundles
@@ -462,7 +462,7 @@ spec:
462462
- name: name
463463
value: sast-shell-check-oci-ta
464464
- name: bundle
465-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
465+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:fc685d6f7dfb7c9ab2f2db38bbe2c8d383407847350ccd8b96352322c487b13c
466466
- name: kind
467467
value: task
468468
resolver: bundles
@@ -488,7 +488,7 @@ spec:
488488
- name: name
489489
value: sast-unicode-check-oci-ta
490490
- name: bundle
491-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
491+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:5807ffe3a0cca5cf970076bbc7a404642cc6e3eebe64e9e5e6a4f20da740bf73
492492
- name: kind
493493
value: task
494494
resolver: bundles
@@ -533,7 +533,7 @@ spec:
533533
- name: name
534534
value: push-dockerfile-oci-ta
535535
- name: bundle
536-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:7855471abfe87de080b914f2f3ca27c59e64f6448a7c2435e51435b764494c71
536+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:581ddbb0b8dc388678cea65b9b3b6265db59f6de1d473006fb84fb0b456886bd
537537
- name: kind
538538
value: task
539539
resolver: bundles
@@ -550,7 +550,7 @@ spec:
550550
- name: name
551551
value: rpms-signature-scan
552552
- name: bundle
553-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
553+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
554554
- name: kind
555555
value: task
556556
resolver: bundles

‎.tekton/cli-main-push.yaml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ spec:
139139
- name: name
140140
value: init
141141
- name: bundle
142-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:90f0e8e134c4bb919956bb095d62365907adeea4fbeb4cebbf5f3f94286bf967
142+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.4@sha256:5a423246792ac501ea279229b42ee57da9927da441c04b5c9ff86817b0856b08
143143
- name: kind
144144
value: task
145145
resolver: bundles
@@ -164,7 +164,7 @@ spec:
164164
- name: name
165165
value: git-clone-oci-ta
166166
- name: bundle
167-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:13d49df7dc9ae301627e45f95a236011422996152f1bea46cd60217b0f057407
167+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:e865b49436c38a0ce41c7d9e726143b2025dea23e9f782b4821f9db8a0e4b625
168168
- name: kind
169169
value: task
170170
resolver: bundles
@@ -190,7 +190,7 @@ spec:
190190
- name: name
191191
value: prefetch-dependencies-oci-ta
192192
- name: bundle
193-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:a2efbcdcecfa5293a622eb356a18f5c88e5714046b214fe8730b43b1a7dbb77d
193+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.3@sha256:92956e75cd4714286f9c0c043f5301d1c0df1d750884edeceee87e0a91cc1975
194194
- name: kind
195195
value: task
196196
resolver: bundles
@@ -241,7 +241,7 @@ spec:
241241
- name: name
242242
value: buildah-remote-oci-ta
243243
- name: bundle
244-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:f667d1146533b1d49829c08097e31faf27db24563da576434a707353de62099f
244+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.9@sha256:148347cf1a291bc3ebe0700d7f61c12f7f4d5e78e59a162f5e622ad67106c4a9
245245
- name: kind
246246
value: task
247247
resolver: bundles
@@ -265,7 +265,7 @@ spec:
265265
- name: name
266266
value: build-image-index
267267
- name: bundle
268-
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:020a1b4126cc6b7c7a919c2b549b94e6b7b826aaaa0d0f2e67d1980df967e498
268+
value: quay.io/konflux-ci/tekton-catalog/task-build-image-index:0.2@sha256:82bc4bdf4151d7d02e80dff07925433573f37c9a503cffa72071bd300c7f2f6c
269269
- name: kind
270270
value: task
271271
resolver: bundles
@@ -286,7 +286,7 @@ spec:
286286
- name: name
287287
value: source-build-oci-ta
288288
- name: bundle
289-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:0917cfc7772e82cb8e74743c2104f43bcf2596aceafe87eec6fce69a8cac5f06
289+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:d8115c74aed42fe9b1b3df149c534ced09f33c7bc6e51449bcaf8ec50699b8a0
290290
- name: kind
291291
value: task
292292
resolver: bundles
@@ -321,7 +321,7 @@ spec:
321321
- name: name
322322
value: tkn-bundle-oci-ta
323323
- name: bundle
324-
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:35ebaaa9ad1b44086f5d92805a5b2eaa8ff26cb9516b7212b64c6b0caf0b6440
324+
value: quay.io/konflux-ci/tekton-catalog/task-tkn-bundle-oci-ta:0.2@sha256:9e5dce0c4b1808ef68ea2b5b77a67936576f82e5b773b5f8a3b7a7b494ebd94d
325325
- name: kind
326326
value: task
327327
resolver: bundles
@@ -365,7 +365,7 @@ spec:
365365
- name: name
366366
value: clair-scan
367367
- name: bundle
368-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:8fad4c2e2f470f82ee43d6b2ac72327b4d9c6e9cb514a678911c1c9359c29894
368+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:312fb4d135e351bde38bcb14a7897b238d0aac19703b4e507c105f12b57836f1
369369
- name: kind
370370
value: task
371371
resolver: bundles
@@ -385,7 +385,7 @@ spec:
385385
- name: name
386386
value: ecosystem-cert-preflight-checks
387387
- name: bundle
388-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:25dcef1d9270b2e03fe6710a733171f7c7208e341fc627dac3a579088f44af34
388+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:3c4f60ebda2225eff6a6bc387d9bbd443f1264d756bf385f97cc684992e904a0
389389
- name: kind
390390
value: task
391391
resolver: bundles
@@ -411,7 +411,7 @@ spec:
411411
- name: name
412412
value: sast-snyk-check-oci-ta
413413
- name: bundle
414-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8f3ecbeaff579e41b8278f82d7fabac27845db17a8e687ea6c510c0c9aceabbb
414+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:8d794f3c04de1b47b76f9e48a2be19520568d8b467598976cbd440c44532f970
415415
- name: kind
416416
value: task
417417
resolver: bundles
@@ -464,7 +464,7 @@ spec:
464464
- name: name
465465
value: sast-shell-check-oci-ta
466466
- name: bundle
467-
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:c4ef47e3b4e0508572d266fb745be7e374c29dc02580328cbe9f4d472a8aca57
467+
value: quay.io/konflux-ci/tekton-catalog/task-sast-shell-check-oci-ta:0.1@sha256:fc685d6f7dfb7c9ab2f2db38bbe2c8d383407847350ccd8b96352322c487b13c
468468
- name: kind
469469
value: task
470470
resolver: bundles
@@ -490,7 +490,7 @@ spec:
490490
- name: name
491491
value: sast-unicode-check-oci-ta
492492
- name: bundle
493-
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:90efa582de7770d55102b74014a765cd16a25a56f2cf644b56a788c70c4dc749
493+
value: quay.io/konflux-ci/tekton-catalog/task-sast-unicode-check-oci-ta:0.4@sha256:5807ffe3a0cca5cf970076bbc7a404642cc6e3eebe64e9e5e6a4f20da740bf73
494494
- name: kind
495495
value: task
496496
resolver: bundles
@@ -535,7 +535,7 @@ spec:
535535
- name: name
536536
value: push-dockerfile-oci-ta
537537
- name: bundle
538-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:7855471abfe87de080b914f2f3ca27c59e64f6448a7c2435e51435b764494c71
538+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.3@sha256:581ddbb0b8dc388678cea65b9b3b6265db59f6de1d473006fb84fb0b456886bd
539539
- name: kind
540540
value: task
541541
resolver: bundles
@@ -552,7 +552,7 @@ spec:
552552
- name: name
553553
value: rpms-signature-scan
554554
- name: bundle
555-
value: quay.io/konflux-ci/konflux-vanguard/task-rpms-signature-scan:0.2@sha256:2f3015ac7a642ea7f104d2194a8cb45921570f9539c6604ddcb5f62796f22a53
555+
value: quay.io/konflux-ci/tekton-catalog/task-rpms-signature-scan:0.2@sha256:65370ccb44ff82e4ce128addd913f3c96b298607b3760ee1339ed10011a4bd6b
556556
- name: kind
557557
value: task
558558
resolver: bundles

‎.tool-versions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
golang 1.25.8
1+
golang 1.26.3

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM docker.io/library/golang:1.25.8 AS build
19+
FROM docker.io/library/golang:1.26.3 AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
4343

4444
## Final image
4545

46-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362
46+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:44bc70ef6e6ea9a70e353be97f4722e10358d09fbb9494ca943b2a641049690e
4747

4848
ARG TARGETOS
4949
ARG TARGETARCH

‎Dockerfile.dist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
## Build
1818

19-
FROM registry.access.redhat.com/ubi9/go-toolset:1.25.8@sha256:7a0aad98db45c0aac69813bb9b5af20018bd51f47a2fc183aeca89d6a05c046e AS build
19+
FROM registry.access.redhat.com/ubi9/go-toolset:1.26.3@sha256:17c888d75753f128f6cbdc5587932c3abd2632ca8e0931aa27b9a60c7a75ac62 AS build
2020

2121
ARG TARGETOS
2222
ARG TARGETARCH
@@ -43,7 +43,7 @@ RUN /build/build.sh "${BUILD_LIST}" "${BUILD_SUFFIX}"
4343

4444
## Final image
4545

46-
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:5b74fce9d6e629942a0c6dc0f546c193e70d7f974d999a48c948c53dd3d36362
46+
FROM registry.access.redhat.com/ubi9/ubi-minimal:latest@sha256:44bc70ef6e6ea9a70e353be97f4722e10358d09fbb9494ca943b2a641049690e
4747

4848
ARG TARGETOS
4949
ARG TARGETARCH

‎Makefile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,19 @@ benchmark_data: benchmark/simple/data.tar.gz ## Prepare data for benchmark
197197
.PHONY: benchmark
198198
benchmark: benchmark_simple ## Run benchmarks
199199

200+
.PHONY: tools-ci
201+
tools-ci: ## Ensure all tools build cleanly
202+
@echo "• tkn:" && \
203+
go run -modfile tools/go.mod github.com/tektoncd/cli/cmd/tkn version && \
204+
echo "• kustomize:" && \
205+
go run -modfile tools/go.mod sigs.k8s.io/kustomize/kustomize/v5 version && \
206+
echo "• helm:" && \
207+
go run -modfile tools/go.mod helm.sh/helm/v3/cmd/helm version && \
208+
echo "• conftest:" && \
209+
go run -modfile tools/go.mod github.com/open-policy-agent/conftest --version
210+
200211
.PHONY: ci
201-
ci: test lint-fix acceptance ## Run the usual required CI tasks
212+
ci: test lint-fix acceptance tools-ci ## Run the usual required CI tasks
202213

203214
##@ Linters
204215

0 commit comments

Comments
 (0)