Skip to content

Commit ceb3dc8

Browse files
jstouracjstourac
committed
Fix/Unify naming of the variables used for the images
This should also fix the commit ID update in the commit.env file.
1 parent 6aa55c9 commit ceb3dc8

10 files changed

+66
-66
lines changed

‎.github/workflows/notebooks-digest-updater-upstream.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ jobs:
7474
"odh-generic-data-science-notebook-image-n"
7575
"odh-tensorflow-gpu-notebook-image-n"
7676
"odh-trustyai-notebook-image-n"
77-
"odh-codeserver-notebook-n"
78-
"odh-rstudio-notebook-n"
79-
"odh-rstudio-gpu-notebook-n")
77+
"odh-codeserver-notebook-image-n"
78+
"odh-rstudio-notebook-image-n"
79+
"odh-rstudio-gpu-notebook-image-n")
8080
8181
for ((i=0;i<${#IMAGES[@]};++i)); do
8282
image=${IMAGES[$i]}
@@ -106,9 +106,9 @@ jobs:
106106
"odh-generic-data-science-notebook-image-commit-n"
107107
"odh-tensorflow-gpu-notebook-image-commit-n"
108108
"odh-trustyai-notebook-image-commit-n"
109-
"odh-codeserver-notebook-n"
110-
"odh-rstudio-notebook-n"
111-
"odh-rstudio-gpu-notebook-n")
109+
"odh-codeserver-notebook-image-commit-n"
110+
"odh-rstudio-notebook-image-commit-n"
111+
"odh-rstudio-gpu-notebook-image-commit-n")
112112
113113
for val in "${COMMIT[@]}"; do
114114
echo $val
@@ -154,9 +154,9 @@ jobs:
154154
"odh-generic-data-science-notebook-image-n-1"
155155
"odh-tensorflow-gpu-notebook-image-n-1"
156156
"odh-trustyai-notebook-image-n-1"
157-
"odh-codeserver-notebook-n-1"
158-
"odh-rstudio-notebook-n-1"
159-
"odh-rstudio-gpu-notebook-n-1")
157+
"odh-codeserver-notebook-image-n-1"
158+
"odh-rstudio-notebook-image-n-1"
159+
"odh-rstudio-gpu-notebook-image-n-1")
160160
161161
for ((i=0;i<${#IMAGES[@]};++i)); do
162162
image=${IMAGES[$i]}
@@ -185,9 +185,9 @@ jobs:
185185
"odh-generic-data-science-notebook-image-commit-n-1"
186186
"odh-tensorflow-gpu-notebook-image-commit-n-1"
187187
"odh-trustyai-notebook-image-commit-n-1"
188-
"odh-codeserver-notebook-n-1"
189-
"odh-rstudio-notebook-n-1"
190-
"odh-rstudio-gpu-notebook-n-1")
188+
"odh-codeserver-notebook-image-commit-n-1"
189+
"odh-rstudio-notebook-image-commit-n-1"
190+
"odh-rstudio-gpu-notebook-image-commit-n-1")
191191
192192
for val in "${COMMIT[@]}"; do
193193
echo $val

‎ci/check-params-env.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -139,35 +139,35 @@ function check_image_variable_matches_name_and_commitref() {
139139
expected_commitref="main"
140140
expected_build_name="habana-jupyter-1.10.0-ubi8-python-3.8"
141141
;;
142-
odh-codeserver-notebook-n)
142+
odh-codeserver-notebook-image-n)
143143
expected_name="odh-notebook-code-server-ubi9-python-3.9"
144144
expected_commitref="2024a"
145145
expected_build_name="codeserver-ubi9-python-3.9-amd64"
146146
;;
147-
odh-codeserver-notebook-n-1)
147+
odh-codeserver-notebook-image-n-1)
148148
expected_name="odh-notebook-code-server-ubi9-python-3.9"
149149
expected_commitref="2023b"
150150
expected_build_name="codeserver-ubi9-python-3.9-amd64"
151151
;;
152-
odh-rstudio-notebook-n)
152+
odh-rstudio-notebook-image-n)
153153
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
154154
expected_commitref="2024a"
155155
expected_build_name="rstudio-c9s-python-3.9-amd64"
156156
;;
157-
odh-rstudio-notebook-n-1)
157+
odh-rstudio-notebook-image-n-1)
158158
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
159159
expected_commitref="2023b"
160160
expected_build_name="rstudio-c9s-python-3.9-amd64"
161161
;;
162162
# For both RStudio GPU workbenches - the final name labels are identical to plain RStudio ones
163163
# This is because the very same RStudio Dockerfile is used but different base images in both cases
164164
# We should consider what to do with this - in ideal case, we should have different labels for these cases.
165-
odh-rstudio-gpu-notebook-n)
165+
odh-rstudio-gpu-notebook-image-n)
166166
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
167167
expected_commitref="2024a"
168168
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
169169
;;
170-
odh-rstudio-gpu-notebook-n-1)
170+
odh-rstudio-gpu-notebook-image-n-1)
171171
expected_name="odh-notebook-rstudio-server-c9s-python-3.9"
172172
expected_commitref="2023b"
173173
expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"

‎ci/security-scan/quay_security_analysis.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
"odh-tensorflow-gpu-notebook-image-main",
2121
"odh-trustyai-notebook-image-main",
2222
"odh-habana-notebook-image-main",
23-
"odh-codeserver-notebook-main",
24-
"odh-rstudio-notebook-main",
25-
"odh-rstudio-gpu-notebook-main"
23+
"odh-codeserver-notebook-image-main",
24+
"odh-rstudio-notebook-image-main",
25+
"odh-rstudio-gpu-notebook-image-main"
2626
]
2727

2828
IMAGES = [
@@ -37,9 +37,9 @@
3737
"odh-runtime-tensorflow-notebook-image-n",
3838
"odh-trustyai-notebook-image-n",
3939
"odh-habana-notebook-image-n",
40-
"odh-codeserver-notebook-n",
41-
"odh-rstudio-notebook-n",
42-
"odh-rstudio-gpu-notebook-n"
40+
"odh-codeserver-notebook-image-n",
41+
"odh-rstudio-notebook-image-n",
42+
"odh-rstudio-gpu-notebook-image-n"
4343
]
4444

4545
IMAGES_N_1 = [
@@ -53,9 +53,9 @@
5353
"odh-tensorflow-gpu-notebook-image-n-1",
5454
"odh-runtime-tensorflow-notebook-image-n-1",
5555
"odh-trustyai-notebook-image-n-1",
56-
"odh-codeserver-notebook-n-1",
57-
"odh-rstudio-notebook-n-1",
58-
"odh-rstudio-gpu-notebook-n-1"
56+
"odh-codeserver-notebook-image-n-1",
57+
"odh-rstudio-notebook-image-n-1",
58+
"odh-rstudio-gpu-notebook-image-n-1"
5959
]
6060

6161
def generate_markdown_table(branch_dictionary):

‎ci/security-scan/weekly_commit_ids.env

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:bf2087
1818
odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:5b5bae7a11f2e34b67726a86d24b8f2c35c701a48d80abbdbc91030033d2fc1f
1919
odh-habana-notebook-image-main=quay.io/opendatahub/workbench-images@sha256:f5237ad45f84a9adfc5e30d6fab809dcd7fd10dc9048b3c82f8dfe71d2d7eb2c
2020
odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
21-
odh-codeserver-notebook-main=quay.io/opendatahub/workbench-images@sha256:2797380eaf0f05d6002e9fbb41a6a8b5368b658230ba46b07341c9c96797f591
22-
odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3
23-
odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
24-
odh-rstudio-notebook-main=quay.io/opendatahub/workbench-images@sha256:cffcf81ca0dba140d3dfc5ab452eebd6db92e55da5bdfbe3f931661489a8a596
25-
odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608
26-
odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
27-
odh-rstudio-gpu-notebook-main=quay.io/opendatahub/workbench-images@sha256:41d07177990519db629796f743b6dcb663bc8090e4c8248348f746b2fa4f7dbb
28-
odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd
29-
odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
21+
odh-codeserver-notebook-image-main=quay.io/opendatahub/workbench-images@sha256:2797380eaf0f05d6002e9fbb41a6a8b5368b658230ba46b07341c9c96797f591
22+
odh-codeserver-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3
23+
odh-codeserver-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
24+
odh-rstudio-notebook-image-main=quay.io/opendatahub/workbench-images@sha256:cffcf81ca0dba140d3dfc5ab452eebd6db92e55da5bdfbe3f931661489a8a596
25+
odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608
26+
odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
27+
odh-rstudio-gpu-notebook-image-main=quay.io/opendatahub/workbench-images@sha256:41d07177990519db629796f743b6dcb663bc8090e4c8248348f746b2fa4f7dbb
28+
odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd
29+
odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
3030
odh-runtime-minimal-notebook-image-main=quay.io/opendatahub/workbench-images@sha256:b02d8970449a48362a9f54ea563692b8d4c0e9f1f689ea1cf6bd2da18538a421
3131
odh-runtime-minimal-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:91224cde193645c231e454bdcc25ab1aa40dd7c7bc466c87baffa8c03f5e3128
3232
odh-runtime-minimal-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:41dd881199fd93ffccc4f00c16a69ad16f27f1e4877373ad96ff7a94b9564972

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n)
2424
from:
2525
kind: DockerImage
26-
name: $(odh-codeserver-notebook-n)
26+
name: $(odh-codeserver-notebook-image-n)
2727
name: "2024.1"
2828
referencePolicy:
2929
type: Source
@@ -36,7 +36,7 @@ spec:
3636
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n-1)
3737
from:
3838
kind: DockerImage
39-
name: $(odh-codeserver-notebook-n-1)
39+
name: $(odh-codeserver-notebook-image-n-1)
4040
name: "2023.2"
4141
referencePolicy:
4242
type: Source

‎manifests/base/kustomization.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,48 +123,48 @@ vars:
123123
apiVersion: v1
124124
fieldref:
125125
fieldpath: data.odh-habana-notebook-image-n-1
126-
- name: odh-codeserver-notebook-n
126+
- name: odh-codeserver-notebook-image-n
127127
objref:
128128
kind: ConfigMap
129129
name: notebooks-parameters
130130
apiVersion: v1
131131
fieldref:
132-
fieldpath: data.odh-codeserver-notebook-n
133-
- name: odh-codeserver-notebook-n-1
132+
fieldpath: data.odh-codeserver-notebook-image-n
133+
- name: odh-codeserver-notebook-image-n-1
134134
objref:
135135
kind: ConfigMap
136136
name: notebooks-parameters
137137
apiVersion: v1
138138
fieldref:
139-
fieldpath: data.odh-codeserver-notebook-n-1
140-
- name: odh-rstudio-notebook-n
139+
fieldpath: data.odh-codeserver-notebook-image-n-1
140+
- name: odh-rstudio-notebook-image-n
141141
objref:
142142
kind: ConfigMap
143143
name: notebooks-parameters
144144
apiVersion: v1
145145
fieldref:
146-
fieldpath: data.odh-rstudio-notebook-n
147-
- name: odh-rstudio-notebook-n-1
146+
fieldpath: data.odh-rstudio-notebook-image-n
147+
- name: odh-rstudio-notebook-image-n-1
148148
objref:
149149
kind: ConfigMap
150150
name: notebooks-parameters
151151
apiVersion: v1
152152
fieldref:
153-
fieldpath: data.odh-rstudio-notebook-n-1
154-
- name: odh-rstudio-gpu-notebook-n
153+
fieldpath: data.odh-rstudio-notebook-image-n-1
154+
- name: odh-rstudio-gpu-notebook-image-n
155155
objref:
156156
kind: ConfigMap
157157
name: notebooks-parameters
158158
apiVersion: v1
159159
fieldref:
160-
fieldpath: data.odh-rstudio-gpu-notebook-n
161-
- name: odh-rstudio-gpu-notebook-n-1
160+
fieldpath: data.odh-rstudio-gpu-notebook-image-n
161+
- name: odh-rstudio-gpu-notebook-image-n-1
162162
objref:
163163
kind: ConfigMap
164164
name: notebooks-parameters
165165
apiVersion: v1
166166
fieldref:
167-
fieldpath: data.odh-rstudio-gpu-notebook-n-1
167+
fieldpath: data.odh-rstudio-gpu-notebook-image-n-1
168168
- name: odh-minimal-notebook-image-commit-n
169169
objref:
170170
kind: ConfigMap

‎manifests/base/params.env

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:0f7818
1212
odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:ce13ae13e9087940eaa4604ca4da2e6fe457cb3b9e637ddec9bc0ebb6b6c23aa
1313
odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:4c0120a634277d0ce635d8ea1d4d10e89051df4ddb5de68de8430b83e597b41e
1414
odh-habana-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe
15-
odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:ab81320e649c97f0c55c03e5132cc8c09700aa736d1f9b7c950dd9f404f8dd44
16-
odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:65e8f7ab736f00cc457bea7c3f2c1807f5277174aa23a403472b26390a6c6ba9
17-
odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:10a27f17c11ed61c641a9946306b0dd7e1cc20a6210274843224e4e4d0fd86d8
18-
odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:7cc4b2160140bd68d56bfdf33437305404dd17cba482d9a6bfe1deba86dd7259
19-
odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:ebb3845de6923af917467b453ed37cdca05ff40041e04fc431c579cca07d1744
20-
odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:37256306e0db902e184997a0691af8082000b6c5ab70ff36caa5819808967536
15+
odh-codeserver-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:ab81320e649c97f0c55c03e5132cc8c09700aa736d1f9b7c950dd9f404f8dd44
16+
odh-codeserver-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:65e8f7ab736f00cc457bea7c3f2c1807f5277174aa23a403472b26390a6c6ba9
17+
odh-rstudio-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:10a27f17c11ed61c641a9946306b0dd7e1cc20a6210274843224e4e4d0fd86d8
18+
odh-rstudio-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:7cc4b2160140bd68d56bfdf33437305404dd17cba482d9a6bfe1deba86dd7259
19+
odh-rstudio-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:ebb3845de6923af917467b453ed37cdca05ff40041e04fc431c579cca07d1744
20+
odh-rstudio-gpu-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:37256306e0db902e184997a0691af8082000b6c5ab70ff36caa5819808967536

‎manifests/base/params.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,24 +59,24 @@ varReference:
5959
- path: spec/tags[]/from/name
6060
kind: ImageStream
6161
apiGroup: image.openshift.io/v1
62-
name: odh-codeserver-notebook-n
62+
name: odh-codeserver-notebook-image-n
6363
- path: spec/tags[]/from/name
6464
kind: ImageStream
6565
apiGroup: image.openshift.io/v1
66-
name: odh-codeserver-notebook-n-1
66+
name: odh-codeserver-notebook-image-n-1
6767
- path: spec/tags[]/from/name
6868
kind: ImageStream
6969
apiGroup: image.openshift.io/v1
70-
name: odh-rstudio-notebook-n
70+
name: odh-rstudio-notebook-image-n
7171
- path: spec/tags[]/from/name
7272
kind: ImageStream
7373
apiGroup: image.openshift.io/v1
74-
name: odh-rstudio-notebook-n-1
74+
name: odh-rstudio-notebook-image-n-1
7575
- path: spec/tags[]/from/name
7676
kind: ImageStream
7777
apiGroup: image.openshift.io/v1
78-
name: odh-rstudio-gpu-notebook-n
78+
name: odh-rstudio-gpu-notebook-image-n
7979
- path: spec/tags[]/from/name
8080
kind: ImageStream
8181
apiGroup: image.openshift.io/v1
82-
name: odh-rstudio-gpu-notebook-n-1
82+
name: odh-rstudio-gpu-notebook-image-n-1

‎manifests/base/rstudio-gpu-notebook-imagestream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
opendatahub.io/notebook-build-commit: $(odh-rstudio-gpu-notebook-image-commit-n)
2525
from:
2626
kind: DockerImage
27-
name: $(odh-rstudio-gpu-notebook-n)
27+
name: $(odh-rstudio-gpu-notebook-image-n)
2828
name: "2024.1"
2929
referencePolicy:
3030
type: Source
@@ -37,7 +37,7 @@ spec:
3737
opendatahub.io/notebook-build-commit: $(odh-rstudio-gpu-notebook-image-commit-n-1)
3838
from:
3939
kind: DockerImage
40-
name: $(odh-rstudio-gpu-notebook-n-1)
40+
name: $(odh-rstudio-gpu-notebook-image-n-1)
4141
name: "2023.2"
4242
referencePolicy:
4343
type: Source

‎manifests/base/rstudio-notebook-imagestream.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
opendatahub.io/notebook-build-commit: $(odh-rstudio-notebook-image-commit-n)
2424
from:
2525
kind: DockerImage
26-
name: $(odh-rstudio-notebook-n)
26+
name: $(odh-rstudio-notebook-image-n)
2727
name: "2024.1"
2828
referencePolicy:
2929
type: Source
@@ -36,7 +36,7 @@ spec:
3636
opendatahub.io/notebook-build-commit: $(odh-rstudio-notebook-image-commit-n-1)
3737
from:
3838
kind: DockerImage
39-
name: $(odh-rstudio-notebook-n-1)
39+
name: $(odh-rstudio-notebook-image-n-1)
4040
name: "2023.2"
4141
referencePolicy:
4242
type: Source

0 commit comments

Comments
 (0)