Skip to content

Commit 22364e2

Browse files
authored
RHOAIENG-17774: ref(manifests): add some newlines and indentation into the json strings with package version information (opendatahub-io#475)
Previously, we used to have every json string on a single line, which meant we had long hard-to-read lines in our manifests. Now there is some human-friendly indentation in the files so it should be easier to read. This is to nave no impact on the data stored, it is a code formatting change only.
1 parent 584f292 commit 22364e2

8 files changed

+334
-38
lines changed

manifests/base/cuda-rstudio-buildconfig.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,18 @@ spec:
2727
tags:
2828
- name: latest
2929
annotations:
30-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"R","version":"v4.4"},{"name":"Python","version":"v3.11"}]'
31-
opendatahub.io/notebook-python-dependencies: '[{"name":"rstudio-server","version":"2024.04.2"}]'
30+
# language=json
31+
opendatahub.io/notebook-software: |
32+
[
33+
{"name":"CUDA","version":"12.4"},
34+
{"name":"R","version":"v4.4"},
35+
{"name":"Python","version":"v3.11"}
36+
]
37+
# language=json
38+
opendatahub.io/notebook-python-dependencies: |
39+
[
40+
{"name":"rstudio-server","version":"2024.04.2"}
41+
]
3242
referencePolicy:
3343
type: Source
3444
---

manifests/base/jupyter-datascience-notebook-imagestream.yaml

Lines changed: 58 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,30 @@ spec:
8686
type: Source
8787
# N-2 Version of the image
8888
- annotations:
89-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
90-
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.13"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
89+
# language=json
90+
opendatahub.io/notebook-software: |
91+
[
92+
{"name":"Python","version":"v3.9"}
93+
]
94+
# language=json
95+
opendatahub.io/notebook-python-dependencies: |
96+
[
97+
{"name":"Boto3","version":"1.28"},
98+
{"name":"Kafka-Python","version":"2.0"},
99+
{"name":"Kfp-tekton","version":"1.5"},
100+
{"name":"Matplotlib","version":"3.6"},
101+
{"name":"Numpy","version":"1.24"},
102+
{"name":"Pandas","version":"1.5"},
103+
{"name":"Scikit-learn","version":"1.3"},
104+
{"name":"Scipy","version":"1.11"},
105+
{"name":"Elyra","version":"3.15"},
106+
{"name":"PyMongo","version":"4.5"},
107+
{"name":"Pyodbc","version":"4.0"},
108+
{"name":"Codeflare-SDK","version":"0.13"},
109+
{"name":"Sklearn-onnx","version":"1.15"},
110+
{"name":"Psycopg","version":"3.1"},
111+
{"name":"MySQL Connector/Python","version":"8.0"}
112+
]
91113
openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook
92114
opendatahub.io/image-tag-outdated: "true"
93115
opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-2)
@@ -99,8 +121,24 @@ spec:
99121
type: Source
100122
# N-3 Version of the image
101123
- annotations:
102-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
103-
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
124+
# language=json
125+
opendatahub.io/notebook-software: |
126+
[
127+
{"name":"Python","version":"v3.9"}
128+
]
129+
# language=json
130+
opendatahub.io/notebook-python-dependencies: |
131+
[
132+
{"name":"Boto3","version":"1.26"},
133+
{"name":"Kafka-Python","version":"2.0"},
134+
{"name":"Kfp-tekton","version":"1.5"},
135+
{"name":"Matplotlib","version":"3.6"},
136+
{"name":"Numpy","version":"1.24"},
137+
{"name":"Pandas","version":"1.5"},
138+
{"name":"Scikit-learn","version":"1.2"},
139+
{"name":"Scipy","version":"1.10"},
140+
{"name":"Elyra","version":"3.15"}
141+
]
104142
openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook
105143
opendatahub.io/image-tag-outdated: "true"
106144
opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-3)
@@ -112,8 +150,22 @@ spec:
112150
type: Source
113151
# N-4 Version of the image
114152
- annotations:
115-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
116-
opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
153+
# language=json
154+
opendatahub.io/notebook-software: |
155+
[
156+
{"name":"Python","version":"v3.8"}
157+
]
158+
# language=json
159+
opendatahub.io/notebook-python-dependencies: |
160+
[
161+
{"name":"Boto3","version":"1.17"},
162+
{"name":"Kafka-Python","version":"2.0"},
163+
{"name":"Matplotlib","version":"3.4"},
164+
{"name":"Numpy","version":"1.19"},
165+
{"name":"Pandas","version":"1.2"},
166+
{"name":"Scikit-learn","version":"0.24"},
167+
{"name":"Scipy","version":"1.6"}
168+
]
117169
openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook
118170
opendatahub.io/image-tag-outdated: 'true'
119171
opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-4)

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

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,18 @@ spec:
6262
type: Source
6363
# N-2 Version of the image
6464
- annotations:
65-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
66-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name":"Notebook","version":"6.5"}]'
65+
# language=json
66+
opendatahub.io/notebook-software: |
67+
[
68+
{"name":"CUDA","version":"11.8"},
69+
{"name":"Python","version":"v3.9"}
70+
]
71+
# language=json
72+
opendatahub.io/notebook-python-dependencies: |
73+
[
74+
{"name":"JupyterLab","version":"3.6"},
75+
{"name":"Notebook","version":"6.5"}
76+
]
6777
openshift.io/imported-from: quay.io/modh/cuda-notebooks
6878
opendatahub.io/image-tag-outdated: "true"
6979
opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-2)
@@ -75,8 +85,18 @@ spec:
7585
type: Source
7686
# N-3 Version of the image
7787
- annotations:
78-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
79-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name":"Notebook","version":"6.5"}]'
88+
# language=json
89+
opendatahub.io/notebook-software: |
90+
[
91+
{"name":"CUDA","version":"11.8"},
92+
{"name":"Python","version":"v3.9"}
93+
]
94+
# language=json
95+
opendatahub.io/notebook-python-dependencies: |
96+
[
97+
{"name":"JupyterLab","version":"3.5"},
98+
{"name":"Notebook","version":"6.5"}
99+
]
80100
openshift.io/imported-from: quay.io/modh/cuda-notebooks
81101
opendatahub.io/image-tag-outdated: "true"
82102
opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-3)
@@ -88,8 +108,18 @@ spec:
88108
type: Source
89109
# N-4 Version of the image
90110
- annotations:
91-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"}]'
92-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.2"},{"name":"Notebook","version":"6.4"}]'
111+
# language=json
112+
opendatahub.io/notebook-software: |
113+
[
114+
{"name":"CUDA","version":"11.4"},
115+
{"name":"Python","version":"v3.8"}
116+
]
117+
# language=json
118+
opendatahub.io/notebook-python-dependencies: |
119+
[
120+
{"name":"JupyterLab","version":"3.2"},
121+
{"name":"Notebook","version":"6.4"}
122+
]
93123
openshift.io/imported-from: quay.io/modh/cuda-notebooks
94124
opendatahub.io/image-tag-outdated: 'true'
95125
opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-4)

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

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,17 @@ spec:
5959
type: Source
6060
# N-2 Version of the image
6161
- annotations:
62-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
63-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.6"}, {"name": "Notebook","version": "6.5"}]'
62+
# language=json
63+
opendatahub.io/notebook-software: |
64+
[
65+
{"name":"Python","version":"v3.9"}
66+
]
67+
# language=json
68+
opendatahub.io/notebook-python-dependencies: |
69+
[
70+
{"name":"JupyterLab","version": "3.6"},
71+
{"name": "Notebook","version": "6.5"}
72+
]
6473
openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
6574
opendatahub.io/image-tag-outdated: "true"
6675
opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-2)
@@ -72,8 +81,17 @@ spec:
7281
type: Source
7382
# N-3 Version of the image
7483
- annotations:
75-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
76-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]'
84+
# language=json
85+
opendatahub.io/notebook-software: |
86+
[
87+
{"name":"Python","version":"v3.9"}
88+
]
89+
# language=json
90+
opendatahub.io/notebook-python-dependencies: |
91+
[
92+
{"name":"JupyterLab","version": "3.5"},
93+
{"name": "Notebook","version": "6.5"}
94+
]
7795
openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
7896
opendatahub.io/image-tag-outdated: "true"
7997
opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-3)
@@ -85,8 +103,17 @@ spec:
85103
type: Source
86104
# N-4 Version of the image
87105
- annotations:
88-
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
89-
opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]'
106+
# language=json
107+
opendatahub.io/notebook-software: |
108+
[
109+
{"name":"Python","version":"v3.8"}
110+
]
111+
# language=json
112+
opendatahub.io/notebook-python-dependencies: |
113+
[
114+
{"name":"JupyterLab","version": "3.2"},
115+
{"name": "Notebook","version": "6.4"}
116+
]
90117
openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
91118
opendatahub.io/image-tag-outdated: 'true'
92119
opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-4)

manifests/base/jupyter-pytorch-notebook-imagestream.yaml

Lines changed: 70 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,34 @@ spec:
9696
type: Source
9797
# N-2 Version of the image
9898
- annotations:
99-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"2.2"}]'
100-
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.2"},{"name":"Tensorboard","version":"2.13"},{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.14"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]'
99+
# language=json
100+
opendatahub.io/notebook-software: |
101+
[
102+
{"name":"CUDA","version":"11.8"},
103+
{"name":"Python","version":"v3.9"},
104+
{"name":"PyTorch","version":"2.2"}
105+
]
106+
# language=json
107+
opendatahub.io/notebook-python-dependencies: |
108+
[
109+
{"name":"PyTorch","version":"2.2"},
110+
{"name":"Tensorboard","version":"2.13"},
111+
{"name":"Boto3","version":"1.28"},
112+
{"name":"Kafka-Python","version":"2.0"},
113+
{"name":"Kfp-tekton","version":"1.5"},
114+
{"name":"Matplotlib","version":"3.6"},
115+
{"name":"Numpy","version":"1.24"},
116+
{"name":"Pandas","version":"1.5"},
117+
{"name":"Scikit-learn","version":"1.3"},
118+
{"name":"Scipy","version":"1.11"},
119+
{"name":"Elyra","version":"3.15"},
120+
{"name":"PyMongo","version":"4.5"},
121+
{"name":"Pyodbc","version":"4.0"},
122+
{"name":"Codeflare-SDK","version":"0.14"},
123+
{"name":"Sklearn-onnx","version":"1.15"},
124+
{"name":"Psycopg","version":"3.1"},
125+
{"name":"MySQL Connector/Python","version":"8.0"}
126+
]
101127
openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook
102128
opendatahub.io/image-tag-outdated: "true"
103129
opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n-2)
@@ -109,8 +135,28 @@ spec:
109135
type: Source
110136
# N-3 Version of the image
111137
- annotations:
112-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]'
113-
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Elyra","version":"3.15"}]'
138+
# language=json
139+
opendatahub.io/notebook-software: |
140+
[
141+
{"name":"CUDA","version":"11.8"},
142+
{"name":"Python","version":"v3.9"},
143+
{"name":"PyTorch","version":"1.13"}
144+
]
145+
# language=json
146+
opendatahub.io/notebook-python-dependencies: |
147+
[
148+
{"name":"PyTorch","version":"1.13"},
149+
{"name":"Tensorboard","version":"2.11"},
150+
{"name":"Boto3","version":"1.26"},
151+
{"name":"Kafka-Python","version":"2.0"},
152+
{"name":"Kfp-tekton","version":"1.5"},
153+
{"name":"Matplotlib","version":"3.6"},
154+
{"name":"Numpy","version":"1.24"},
155+
{"name":"Pandas","version":"1.5"},
156+
{"name":"Scikit-learn","version":"1.2"},
157+
{"name":"Scipy","version":"1.10"},
158+
{"name":"Elyra","version":"3.15"}
159+
]
114160
openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook
115161
opendatahub.io/image-tag-outdated: "true"
116162
opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n-3)
@@ -122,8 +168,26 @@ spec:
122168
type: Source
123169
# N-4 Version of the image
124170
- annotations:
125-
opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"PyTorch","version":"1.8"}]'
126-
opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.8"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]'
171+
# language=json
172+
opendatahub.io/notebook-software: |
173+
[
174+
{"name":"CUDA","version":"11.4"},
175+
{"name":"Python","version":"v3.8"},
176+
{"name":"PyTorch","version":"1.8"}
177+
]
178+
# language=json
179+
opendatahub.io/notebook-python-dependencies: |
180+
[
181+
{"name":"PyTorch","version":"1.8"},
182+
{"name":"Tensorboard","version":"2.6"},
183+
{"name":"Boto3","version":"1.17"},
184+
{"name":"Kafka-Python","version":"2.0"},
185+
{"name":"Matplotlib","version":"3.4"},
186+
{"name":"Numpy","version":"1.19"},
187+
{"name":"Pandas","version":"1.2"},
188+
{"name":"Scikit-learn","version":"0.24"},
189+
{"name":"Scipy","version":"1.6"}
190+
]
127191
openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook
128192
opendatahub.io/image-tag-outdated: 'true'
129193
opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n-4)

0 commit comments

Comments
 (0)