Skip to content

Commit b60baee

Browse files
atheo89atheo89
authored
Update remaining imagestreams and shift the n params as n-1 (#972)
* Update ImageStreams and parameters * Update chech-params-env.sh script * Update paramas.env file
1 parent 5bb0809 commit b60baee

11 files changed

+168
-56
lines changed

‎ci/check-params-env.sh

+40-22
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
2525

2626
# This value needs to be updated everytime we deliberately change number of the
2727
# images we want to have in the `params.env` file.
28-
EXPECTED_NUM_RECORDS=21
28+
EXPECTED_NUM_RECORDS=24
2929

3030
# Size change tresholds:
3131
# Max percentual change
@@ -101,14 +101,14 @@ function check_image_variable_matches_name_and_commitref_and_size() {
101101
case "${image_variable}" in
102102
odh-minimal-notebook-image-n)
103103
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
104-
expected_commitref="2024b"
104+
expected_commitref="main"
105105
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
106106
expected_img_size=520
107107
;;
108108
odh-minimal-notebook-image-n-1)
109-
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
110-
expected_commitref="2024a"
111-
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
109+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
110+
expected_commitref="2024b"
111+
expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
112112
expected_img_size=503
113113
;;
114114
odh-minimal-gpu-notebook-image-n)
@@ -137,14 +137,14 @@ function check_image_variable_matches_name_and_commitref_and_size() {
137137
;;
138138
odh-generic-data-science-notebook-image-n)
139139
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
140-
expected_commitref="2024b"
140+
expected_commitref="main"
141141
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
142142
expected_img_size=961
143143
;;
144144
odh-generic-data-science-notebook-image-n-1)
145-
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
146-
expected_commitref="2024a"
147-
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
145+
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
146+
expected_commitref="2024b"
147+
expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
148148
expected_img_size=904
149149
;;
150150
odh-tensorflow-gpu-notebook-image-n)
@@ -161,38 +161,38 @@ function check_image_variable_matches_name_and_commitref_and_size() {
161161
;;
162162
odh-trustyai-notebook-image-n)
163163
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
164-
expected_commitref="2024b"
164+
expected_commitref="main"
165165
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
166166
expected_img_size=4197
167167
;;
168168
odh-trustyai-notebook-image-n-1)
169-
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
170-
expected_commitref="2024a"
171-
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
172-
expected_img_size=1158
169+
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
170+
expected_commitref="2024b"
171+
expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
172+
expected_img_size=4197
173173
;;
174174
odh-codeserver-notebook-image-n)
175175
expected_name="odh-notebook-code-server-ubi9-python-3.11"
176-
expected_commitref="2024b"
176+
expected_commitref="main"
177177
expected_build_name="codeserver-ubi9-python-3.11-amd64"
178178
expected_img_size=893
179179
;;
180180
odh-codeserver-notebook-image-n-1)
181-
expected_name="odh-notebook-code-server-ubi9-python-3.9"
182-
expected_commitref="2024a"
183-
expected_build_name="codeserver-ubi9-python-3.9-amd64"
181+
expected_name="odh-notebook-code-server-ubi9-python-3.11"
182+
expected_commitref="2024b"
183+
expected_build_name="codeserver-ubi9-python-3.11-amd64"
184184
expected_img_size=850
185185
;;
186186
odh-rstudio-notebook-image-n)
187187
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
188-
expected_commitref="2024b"
188+
expected_commitref="main"
189189
expected_build_name="rstudio-c9s-python-3.11-amd64"
190190
expected_img_size=1242
191191
;;
192192
odh-rstudio-notebook-image-n-1)
193-
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
194-
expected_commitref="2024a"
195-
expected_build_name="rstudio-c9s-python-3.9-amd64"
193+
expected_name="odh-notebook-rstudio-server-c9s-python-3.11"
194+
expected_commitref="2024b"
195+
expected_build_name="rstudio-c9s-python-3.11-amd64"
196196
expected_img_size=1208
197197
;;
198198
# For both RStudio GPU workbenches - the final name labels are identical to plain RStudio ones
@@ -211,18 +211,36 @@ function check_image_variable_matches_name_and_commitref_and_size() {
211211
expected_img_size=7184
212212
;;
213213
odh-rocm-minimal-notebook-image-n)
214+
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
215+
expected_commitref="main"
216+
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
217+
expected_img_size=4830
218+
;;
219+
odh-rocm-minimal-notebook-image-n-1)
214220
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
215221
expected_commitref="2024b"
216222
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
217223
expected_img_size=4830
218224
;;
219225
odh-rocm-pytorch-notebook-image-n)
226+
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
227+
expected_commitref="main"
228+
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
229+
expected_img_size=6571
230+
;;
231+
odh-rocm-pytorch-notebook-image-n-1)
220232
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
221233
expected_commitref="2024b"
222234
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
223235
expected_img_size=6571
224236
;;
225237
odh-rocm-tensorflow-notebook-image-n)
238+
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
239+
expected_commitref="main"
240+
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
241+
expected_img_size=5782
242+
;;
243+
odh-rocm-tensorflow-notebook-image-n-1)
226244
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
227245
expected_commitref="2024b"
228246
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"

‎manifests/base/code-server-notebook-imagestream.yaml

+15-15
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@ spec:
1919
# language=json
2020
opendatahub.io/notebook-software: |
2121
[
22-
{"name": "code-server", "version": "4.92"},
22+
{"name": "code-server", "version": "4.98"},
2323
{"name": "Python", "version": "v3.11"}
2424
]
2525
# language=json
2626
opendatahub.io/notebook-python-dependencies: |
2727
[
28-
{"name": "Boto3", "version": "1.34"},
29-
{"name": "Kafka-Python", "version": "2.0"},
30-
{"name": "Matplotlib", "version": "3.8"},
31-
{"name": "Numpy", "version": "1.26"},
28+
{"name": "Boto3", "version": "1.37"},
29+
{"name": "Kafka-Python-ng", "version": "2.2"},
30+
{"name": "Matplotlib", "version": "3.10"},
31+
{"name": "Numpy", "version": "2.2"},
3232
{"name": "Pandas", "version": "2.2"},
33-
{"name": "Scikit-learn", "version": "1.4"},
34-
{"name": "Scipy", "version": "1.12"},
35-
{"name": "Sklearn-onnx", "version": "1.16"},
33+
{"name": "Scikit-learn", "version": "1.6"},
34+
{"name": "Scipy", "version": "1.15"},
35+
{"name": "Sklearn-onnx", "version": "1.18"},
3636
{"name": "ipykernel", "version": "6.29"},
37-
{"name": "Kubeflow-Training", "version": "1.8"}
37+
{"name": "Kubeflow-Training", "version": "1.9"}
3838
]
3939
openshift.io/imported-from: quay.io/opendatahub/workbench-images
4040
opendatahub.io/workbench-image-recommended: 'true'
4141
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n)
4242
from:
4343
kind: DockerImage
4444
name: $(odh-codeserver-notebook-image-n)
45-
name: "2024.2"
45+
name: "2025.1"
4646
referencePolicy:
4747
type: Source
4848
# N-1 Version of the image
4949
- annotations:
5050
# language=json
5151
opendatahub.io/notebook-software: |
5252
[
53-
{"name": "code-server", "version": "4.22"},
54-
{"name": "Python", "version": "v3.9"}
53+
{"name": "code-server", "version": "4.92"},
54+
{"name": "Python", "version": "v3.11"}
5555
]
5656
# language=json
5757
opendatahub.io/notebook-python-dependencies: |
@@ -61,18 +61,18 @@ spec:
6161
{"name": "Matplotlib", "version": "3.8"},
6262
{"name": "Numpy", "version": "1.26"},
6363
{"name": "Pandas", "version": "2.2"},
64-
{"name": "Plotly", "version": "5.19"},
6564
{"name": "Scikit-learn", "version": "1.4"},
6665
{"name": "Scipy", "version": "1.12"},
6766
{"name": "Sklearn-onnx", "version": "1.16"},
68-
{"name": "ipykernel", "version": "6.29"}
67+
{"name": "ipykernel", "version": "6.29"},
68+
{"name": "Kubeflow-Training", "version": "1.8"}
6969
]
7070
openshift.io/imported-from: quay.io/opendatahub/workbench-images
7171
opendatahub.io/workbench-image-recommended: 'false'
7272
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n-1)
7373
from:
7474
kind: DockerImage
7575
name: $(odh-codeserver-notebook-image-n-1)
76-
name: "2024.1"
76+
name: "2024.2"
7777
referencePolicy:
7878
type: Source

‎manifests/base/commit.env

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
11
odh-minimal-notebook-image-commit-n=60b6ecc
2-
odh-minimal-notebook-image-commit-n-1=db50769
2+
odh-minimal-notebook-image-commit-n-1=60b6ecc
33
odh-minimal-gpu-notebook-image-commit-n=29e0dde
44
odh-minimal-gpu-notebook-image-commit-n-1=60b6ecc
55
odh-pytorch-gpu-notebook-image-commit-n=29e0dde
66
odh-pytorch-gpu-notebook-image-commit-n-1=60b6ecc
77
odh-generic-data-science-notebook-image-commit-n=60b6ecc
8-
odh-generic-data-science-notebook-image-commit-n-1=db50769
8+
odh-generic-data-science-notebook-image-commit-n-1=60b6ecc
99
odh-tensorflow-gpu-notebook-image-commit-n=29e0dde
1010
odh-tensorflow-gpu-notebook-image-commit-n-1=60b6ecc
1111
odh-trustyai-notebook-image-commit-n=60b6ecc
12-
odh-trustyai-notebook-image-commit-n-1=db50769
12+
odh-trustyai-notebook-image-commit-n-1=60b6ecc
1313
odh-codeserver-notebook-image-commit-n=60b6ecc
14-
odh-codeserver-notebook-image-commit-n-1=db50769
14+
odh-codeserver-notebook-image-commit-n-1=60b6ecc
1515
odh-rstudio-notebook-image-commit-n=60b6ecc
16-
odh-rstudio-notebook-image-commit-n-1=db50769
16+
odh-rstudio-notebook-image-commit-n-1=60b6ecc
1717
odh-rstudio-gpu-notebook-image-commit-n=29e0dde
1818
odh-rstudio-gpu-notebook-image-commit-n-1=60b6ecc
1919
odh-rocm-minimal-notebook-image-commit-n=60b6ecc
20+
odh-rocm-minimal-notebook-image-commit-n-1=60b6ecc
2021
odh-rocm-pytorch-notebook-image-commit-n=60b6ecc
22+
odh-rocm-pytorch-notebook-image-commit-n-1=60b6ecc
2123
odh-rocm-tensorflow-notebook-image-commit-n=60b6ecc
24+
odh-rocm-tensorflow-notebook-image-commit-n-1=60b6ecc

‎manifests/base/commit.yaml

+12
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,23 @@ varReference:
7676
kind: ImageStream
7777
apiGroup: image.openshift.io/v1
7878
name: odh-rocm-minimal-notebook-image-commit-n
79+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
80+
kind: ImageStream
81+
apiGroup: image.openshift.io/v1
82+
name: odh-rocm-minimal-notebook-image-commit-n-1
7983
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
8084
kind: ImageStream
8185
apiGroup: image.openshift.io/v1
8286
name: odh-rocm-pytorch-notebook-image-commit-n
87+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
88+
kind: ImageStream
89+
apiGroup: image.openshift.io/v1
90+
name: odh-rocm-pytorch-notebook-image-commit-n-1
8391
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
8492
kind: ImageStream
8593
apiGroup: image.openshift.io/v1
8694
name: odh-rocm-tensorflow-notebook-image-commit-n
95+
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
96+
kind: ImageStream
97+
apiGroup: image.openshift.io/v1
98+
name: odh-rocm-tensorflow-notebook-image-commit-n-1

‎manifests/base/jupyter-minimal-notebook-imagestream.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ spec:
3333
from:
3434
kind: DockerImage
3535
name: $(odh-minimal-notebook-image-n)
36-
name: "2024.2"
36+
name: "2025.1"
3737
referencePolicy:
3838
type: Source
39-
# N Version of the image
39+
# N-1 Version of the image
4040
- annotations:
4141
# language=json
4242
opendatahub.io/notebook-software: |
4343
[
44-
{"name": "Python", "version": "v3.9"}
44+
{"name": "Python", "version": "v3.11"}
4545
]
4646
# language=json
4747
opendatahub.io/notebook-python-dependencies: |
@@ -56,6 +56,6 @@ spec:
5656
from:
5757
kind: DockerImage
5858
name: $(odh-minimal-notebook-image-n-1)
59-
name: "2024.1"
59+
name: "2024.2"
6060
referencePolicy:
6161
type: Source

‎manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml

+23-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
# language=json
2121
opendatahub.io/notebook-software: |
2222
[
23-
{"name": "ROCm", "version": "6.1"},
23+
{"name": "ROCm", "version": "6.2"},
2424
{"name": "Python", "version": "v3.11"}
2525
]
2626
# language=json
@@ -34,6 +34,28 @@ spec:
3434
from:
3535
kind: DockerImage
3636
name: $(odh-rocm-minimal-notebook-image-n)
37+
name: "2025.1"
38+
referencePolicy:
39+
type: Source
40+
# N-1 Version of the image
41+
- annotations:
42+
# language=json
43+
opendatahub.io/notebook-software: |
44+
[
45+
{"name": "ROCm", "version": "6.1"},
46+
{"name": "Python", "version": "v3.11"}
47+
]
48+
# language=json
49+
opendatahub.io/notebook-python-dependencies: |
50+
[
51+
{"name": "JupyterLab", "version": "4.2"}
52+
]
53+
openshift.io/imported-from: quay.io/opendatahub/workbench-images
54+
opendatahub.io/workbench-image-recommended: 'false'
55+
opendatahub.io/notebook-build-commit: $(odh-rocm-minimal-notebook-image-commit-n-1)
56+
from:
57+
kind: DockerImage
58+
name: $(odh-rocm-minimal-notebook-image-n-1)
3759
name: "2024.2"
3860
referencePolicy:
3961
type: Source

0 commit comments

Comments
 (0)