Skip to content

Commit cee5011

Browse files
atheo89atheo89
authored
Merge pull request #2463 from opendatahub-io/main
Sync odh:stable from odh:main
2 parents 07d8945 + 4897f0f commit cee5011

File tree

95 files changed

+1617
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1617
-490
lines changed

‎.dockerignore‎

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,33 @@
1-
.git/
2-
.idea/
3-
.venv/
41
bin/
52
ci/
63
tests/
74

5+
# IDE
6+
.idea/
7+
8+
# git
9+
.git/
10+
.gitignore
11+
.gitkeep
12+
13+
# Python cache
814
**/.mypy_cache/
915
**/.pytest_cache/
1016
**/__pycache__/
1117
**/*.pyc
1218

13-
**/Dockerfile
19+
# Virtual environment
20+
env/
21+
venv/
22+
.venv/
23+
*.egg-info/
24+
25+
# Dockerfiles
26+
**/Dockerfile*
27+
28+
# Logs
29+
*.log
30+
31+
# OS-specific files
32+
.DS_Store
33+
Thumbs.db

‎.github/workflows/update-tags.yaml‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
---
2+
name: Update Tekton Tags
3+
on: # yamllint disable-line rule:truthy
4+
workflow_dispatch:
5+
inputs:
6+
new_tag:
7+
description: "Set a new image tag (e.g. YYYYx-vn.n)"
8+
required: true
9+
jobs:
10+
update-tags:
11+
runs-on: ubuntu-latest
12+
permissions:
13+
contents: write
14+
pull-requests: write
15+
steps:
16+
- name: Checkout repo
17+
uses: actions/checkout@v5
18+
with:
19+
ref: main
20+
fetch-depth: 0
21+
22+
- name: Detect and replace tags in .tekton and params-latest.env files
23+
id: replace
24+
run: |
25+
set -e
26+
regex="[0-9]{4}[a-z]-v[0-9]+\.[0-9]+"
27+
new_tag="${{ github.event.inputs.new_tag }}"
28+
29+
echo "Searching for tags in .tekton/*.yaml..."
30+
prev_tag=$(grep -rhoP "$regex" .tekton/*.yaml | sort -u | head -n1)
31+
32+
if [ -z "$prev_tag" ]; then
33+
echo "❌ No matching tag found with regex $regex"
34+
exit 1
35+
fi
36+
37+
echo "Found previous tag: $prev_tag"
38+
echo "Replacing $prev_tag -> $new_tag"
39+
40+
# Update Tekton yamls
41+
find .tekton -type f -name "*.yaml" -print0 | \
42+
xargs -0 -I{} perl -0777 -i -pe "s/\Q$prev_tag\E/$new_tag/g" "{}"
43+
44+
# Update params-latest.env
45+
perl -pi -e "s/\Q$prev_tag\E/$new_tag/g" manifests/base/params-latest.env
46+
47+
# Export previous tag for later steps
48+
echo "previous_tag=$prev_tag" >> $GITHUB_OUTPUT
49+
50+
- name: Commit and push changes to branch
51+
id: commit
52+
run: |
53+
branch="update-tekton-tag-${{ github.event.inputs.new_tag }}"
54+
prev_tag="${{ steps.replace.outputs.previous_tag }}"
55+
new_tag="${{ github.event.inputs.new_tag }}"
56+
57+
git config user.name "github-actions[bot]"
58+
git config user.email "github-actions[bot]@users.noreply.github.com"
59+
60+
if git diff --quiet; then
61+
echo "✅ No changes to commit"
62+
exit 0
63+
fi
64+
65+
git checkout -b "$branch"
66+
git add .tekton/*.yaml manifests/base/params-latest.env
67+
git commit -m "chore: update tags from ${prev_tag} to ${new_tag}"
68+
git push origin "$branch"
69+
echo "branch=$branch" >> $GITHUB_OUTPUT
70+
71+
- name: Create Pull Request
72+
run: |
73+
branch="${{ steps.commit.outputs.branch }}"
74+
prev_tag="${{ steps.replace.outputs.previous_tag }}"
75+
new_tag="${{ github.event.inputs.new_tag }}"
76+
77+
body=":rocket: Automated Tekton + params-latest.env image tag update.
78+
- Updated from \`${prev_tag}\` → \`${new_tag}\`
79+
- Created by \`.github/workflows/update-tekton-tags.yaml\`"
80+
81+
gh pr create \
82+
--repo "$GITHUB_REPOSITORY" \
83+
--title "chore: update image tags ${prev_tag} → ${new_tag}" \
84+
--body "$body" \
85+
--head "$branch" \
86+
--base main
87+
env:
88+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.tekton/multiarch-pull-request-pipeline.yaml‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,11 @@ spec:
3838
name: output-image
3939
type: string
4040
- default: .
41-
description: Path to the source code of an application's component from where
42-
to build image.
41+
description: Path to the source code of an application's component from where to build image.
4342
name: path-context
4443
type: string
4544
- default: Dockerfile
46-
description: Path to the Dockerfile inside the context specified by parameter
47-
path-context
45+
description: Path to the Dockerfile inside the context specified by parameter path-context
4846
name: dockerfile
4947
type: string
5048
- default: "false"
@@ -64,8 +62,7 @@ spec:
6462
name: prefetch-input
6563
type: string
6664
- default: ""
67-
description: Image tag expiration time, time values could be something like
68-
1h, 2d, 3w for hours, days, and weeks, respectively.
65+
description: Image tag expiration time, time values could be something like 1h, 2d, 3w for hours, days, and weeks, respectively.
6966
name: image-expires-after
7067
type: string
7168
- default: "false"
@@ -89,14 +86,12 @@ spec:
8986
name: build-args-file
9087
type: string
9188
- default: "false"
92-
description: Whether to enable privileged mode, should be used only with remote
93-
VMs
89+
description: Whether to enable privileged mode, should be used only with remote VMs
9490
name: privileged-nested
9591
type: string
9692
- default:
9793
- linux/x86_64
98-
description: List of platforms to build the container images on. The available
99-
set of values is determined by the configuration of the multi-platform-controller.
94+
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
10095
name: build-platforms
10196
type: array
10297
results:
@@ -126,7 +121,7 @@ spec:
126121
- name: name
127122
value: init
128123
- name: bundle
129-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ded314206f09712b2116deb050b774ae7efef9ab243794334c8e616871a3ffa5
124+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
130125
- name: kind
131126
value: task
132127
resolver: bundles
@@ -147,7 +142,7 @@ spec:
147142
- name: name
148143
value: git-clone-oci-ta
149144
- name: bundle
150-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:4a601aeec58a1dd89c271e728fd8f0d84777825b46940c3aec27f15bab3edacf
145+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:efcce59f226b1426f7685917e41a50b73478f38fe9ac56c98f1e961effd4b6f0
151146
- name: kind
152147
value: task
153148
resolver: bundles
@@ -176,7 +171,7 @@ spec:
176171
- name: name
177172
value: prefetch-dependencies-oci-ta
178173
- name: bundle
179-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0b58e5132333dd3b710ef9c18ecebe0d5e5b22066ba56481d34431c989cb21dd
174+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d08e349032c57367d543c0bbd070386709614ade1db8e5eddeab29b1338f6653
180175
- name: kind
181176
value: task
182177
resolver: bundles
@@ -226,7 +221,7 @@ spec:
226221
- name: name
227222
value: buildah-remote-oci-ta
228223
- name: bundle
229-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:252e5c94fb2375c43bdfd4b65097d246f4f37392956b08e5c38f366623a0b9ce
224+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:7ff1a2e486924478e7724005464d60dab9a85e2ae4734818057ece3845797509
230225
- name: kind
231226
value: task
232227
resolver: bundles
@@ -281,7 +276,7 @@ spec:
281276
- name: name
282277
value: source-build-oci-ta
283278
- name: bundle
284-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:a48c950350c5e9945cc4ad6bfad7fc653aa437c9eff74a25fd1d42fda4fe344d
279+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:21d33596cf7ff61cab38b68caf578e55509748962bf6f4030bf1dfb8cd68a257
285280
- name: kind
286281
value: task
287282
resolver: bundles
@@ -316,7 +311,12 @@ spec:
316311
operator: in
317312
values:
318313
- "false"
319-
- name: clair-scan
314+
- matrix:
315+
params:
316+
- name: image-platform
317+
value:
318+
- $(params.build-platforms)
319+
name: clair-scan
320320
params:
321321
- name: image-digest
322322
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -329,7 +329,7 @@ spec:
329329
- name: name
330330
value: clair-scan
331331
- name: bundle
332-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
332+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
333333
- name: kind
334334
value: task
335335
resolver: bundles
@@ -349,7 +349,7 @@ spec:
349349
- name: name
350350
value: ecosystem-cert-preflight-checks
351351
- name: bundle
352-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:365c65ed8dfbd83c4a49300dcb9c74c5c3f027efec0be1a1f0baa9633c29b249
352+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
353353
- name: kind
354354
value: task
355355
resolver: bundles
@@ -375,7 +375,7 @@ spec:
375375
- name: name
376376
value: sast-snyk-check-oci-ta
377377
- name: bundle
378-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e371aa09c65ab309138b4aeae9ea4dd93f83119c5cc61e9f2057fe5bb518fbe9
378+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
379379
- name: kind
380380
value: task
381381
resolver: bundles
@@ -540,7 +540,7 @@ spec:
540540
- name: name
541541
value: apply-tags
542542
- name: bundle
543-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:e0de426d492e195f59c99d2ea1ca0df7bfb8c689f5d1468fe7f70eb8684b8d02
543+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
544544
- name: kind
545545
value: task
546546
resolver: bundles
@@ -563,7 +563,7 @@ spec:
563563
- name: name
564564
value: push-dockerfile-oci-ta
565565
- name: bundle
566-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:235ef6e835de8171c07b8a7f8947d0b40bfcff999e1ff3cb6ddd9acc65c48430
566+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:06529ba66b37bdc1f55590359aa849bc570b4e9c110c983e27f07081dc09a12b
567567
- name: kind
568568
value: task
569569
resolver: bundles

‎.tekton/multiarch-push-pipeline.yaml‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ spec:
113113
type: string
114114
- default:
115115
- linux/x86_64
116-
description: List of platforms to build the container images on. The available
117-
set of values is determined by the configuration of the multi-platform-controller.
116+
description: List of platforms to build the container images on. The available set of values is determined by the configuration of the multi-platform-controller.
118117
name: build-platforms
119118
type: array
120119
results:
@@ -180,7 +179,7 @@ spec:
180179
- name: name
181180
value: init
182181
- name: bundle
183-
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ded314206f09712b2116deb050b774ae7efef9ab243794334c8e616871a3ffa5
182+
value: quay.io/konflux-ci/tekton-catalog/task-init:0.2@sha256:ec962d0be18f36ca7d331c99bf243800f569fc0a2ea6f8c8c3d3a574b71c44dc
184183
- name: kind
185184
value: task
186185
resolver: bundles
@@ -203,7 +202,7 @@ spec:
203202
- name: name
204203
value: git-clone-oci-ta
205204
- name: bundle
206-
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:4a601aeec58a1dd89c271e728fd8f0d84777825b46940c3aec27f15bab3edacf
205+
value: quay.io/konflux-ci/tekton-catalog/task-git-clone-oci-ta:0.1@sha256:efcce59f226b1426f7685917e41a50b73478f38fe9ac56c98f1e961effd4b6f0
207206
- name: kind
208207
value: task
209208
resolver: bundles
@@ -232,7 +231,7 @@ spec:
232231
- name: name
233232
value: prefetch-dependencies-oci-ta
234233
- name: bundle
235-
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:0b58e5132333dd3b710ef9c18ecebe0d5e5b22066ba56481d34431c989cb21dd
234+
value: quay.io/konflux-ci/tekton-catalog/task-prefetch-dependencies-oci-ta:0.2@sha256:d08e349032c57367d543c0bbd070386709614ade1db8e5eddeab29b1338f6653
236235
- name: kind
237236
value: task
238237
resolver: bundles
@@ -282,7 +281,7 @@ spec:
282281
- name: name
283282
value: buildah-remote-oci-ta
284283
- name: bundle
285-
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:252e5c94fb2375c43bdfd4b65097d246f4f37392956b08e5c38f366623a0b9ce
284+
value: quay.io/konflux-ci/tekton-catalog/task-buildah-remote-oci-ta:0.4@sha256:7ff1a2e486924478e7724005464d60dab9a85e2ae4734818057ece3845797509
286285
- name: kind
287286
value: task
288287
resolver: bundles
@@ -337,7 +336,7 @@ spec:
337336
- name: name
338337
value: source-build-oci-ta
339338
- name: bundle
340-
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:a48c950350c5e9945cc4ad6bfad7fc653aa437c9eff74a25fd1d42fda4fe344d
339+
value: quay.io/konflux-ci/tekton-catalog/task-source-build-oci-ta:0.3@sha256:21d33596cf7ff61cab38b68caf578e55509748962bf6f4030bf1dfb8cd68a257
341340
- name: kind
342341
value: task
343342
resolver: bundles
@@ -372,7 +371,12 @@ spec:
372371
operator: in
373372
values:
374373
- "false"
375-
- name: clair-scan
374+
- matrix:
375+
params:
376+
- name: image-platform
377+
value:
378+
- $(params.build-platforms)
379+
name: clair-scan
376380
params:
377381
- name: image-digest
378382
value: $(tasks.build-image-index.results.IMAGE_DIGEST)
@@ -385,7 +389,7 @@ spec:
385389
- name: name
386390
value: clair-scan
387391
- name: bundle
388-
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.2@sha256:076d5cde62b55bbfcdda2b4782392256bbda5ad38f839013b4330b3aba70a973
392+
value: quay.io/konflux-ci/tekton-catalog/task-clair-scan:0.3@sha256:a7cc183967f89c4ac100d04ab8f81e54733beee60a0528208107c9a22d3c43af
389393
- name: kind
390394
value: task
391395
resolver: bundles
@@ -405,7 +409,7 @@ spec:
405409
- name: name
406410
value: ecosystem-cert-preflight-checks
407411
- name: bundle
408-
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:365c65ed8dfbd83c4a49300dcb9c74c5c3f027efec0be1a1f0baa9633c29b249
412+
value: quay.io/konflux-ci/tekton-catalog/task-ecosystem-cert-preflight-checks:0.2@sha256:dae8e28761cee4ab0baf04ab9f8f1a4b3cee3c7decf461fda2bacc5c01652a60
409413
- name: kind
410414
value: task
411415
resolver: bundles
@@ -431,7 +435,7 @@ spec:
431435
- name: name
432436
value: sast-snyk-check-oci-ta
433437
- name: bundle
434-
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:e371aa09c65ab309138b4aeae9ea4dd93f83119c5cc61e9f2057fe5bb518fbe9
438+
value: quay.io/konflux-ci/tekton-catalog/task-sast-snyk-check-oci-ta:0.4@sha256:783f5de1b4def2fb3fad20b914f4b3afee46ffb8f652114946e321ef3fa86449
435439
- name: kind
436440
value: task
437441
resolver: bundles
@@ -596,7 +600,7 @@ spec:
596600
- name: name
597601
value: apply-tags
598602
- name: bundle
599-
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:e0de426d492e195f59c99d2ea1ca0df7bfb8c689f5d1468fe7f70eb8684b8d02
603+
value: quay.io/konflux-ci/tekton-catalog/task-apply-tags:0.2@sha256:f44be1bf0262471f2f503f5e19da5f0628dcaf968c86272a2ad6b4871e708448
600604
- name: kind
601605
value: task
602606
resolver: bundles
@@ -619,7 +623,7 @@ spec:
619623
- name: name
620624
value: push-dockerfile-oci-ta
621625
- name: bundle
622-
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:235ef6e835de8171c07b8a7f8947d0b40bfcff999e1ff3cb6ddd9acc65c48430
626+
value: quay.io/konflux-ci/tekton-catalog/task-push-dockerfile-oci-ta:0.1@sha256:06529ba66b37bdc1f55590359aa849bc570b4e9c110c983e27f07081dc09a12b
623627
- name: kind
624628
value: task
625629
resolver: bundles

‎.tekton/odh-pipeline-runtime-datascience-cpu-py312-ubi9-push.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
- name: additional-tags
3434
value:
3535
- '{{target_branch}}-{{revision}}'
36-
- 2025a-v1.35
36+
- 2025b-v1.36
3737
pipelineRef:
3838
name: singlearch-push-pipeline
3939
taskRunTemplate:

0 commit comments

Comments
 (0)