Set the manifests in right order with minor fixes (#735)

* Set the manifests in right order with minor fixes - Introduce ROCm based images to imagestream list - Updated ROCm based images with amd.com/gpu annotation Signed-off-by: Harshad Reddy Nalla <[email protected]> * Adjust the annotation containing python package information Signed-off-by: Harshad Reddy Nalla <[email protected]> --------- Signed-off-by: Harshad Reddy Nalla <[email protected]> Co-authored-by: Diamond Bryant <[email protected]>
opendatahub-io · Oct 5, 2024 · da5d4bf · da5d4bf
1 parent 6347ae5
commit da5d4bf
Show file tree

Hide file tree

Showing 10 changed files with 110 additions and 41 deletions.
diff --git a/manifests/base/README.md b/manifests/base/README.md
@@ -0,0 +1,20 @@
+# IDE Imagestreams
+
+Listing the order in which each imagestreams are introduced.
+
+1. jupyter-minimal-notebook-imagestream.yaml
+2. jupyter-datascience-notebook-imagestream.yaml
+3. jupyter-minimal-gpu-notebook-imagestream.yaml
+4. jupyter-pytorch-notebook-imagestream.yaml
+5. jupyter-tensorflow-notebook-imagestream.yaml
+6. jupyter-trustyai-notebook-imagestream.yaml
+7. ~~jupyter-habana-notebook-imagestream.yaml~~ # Deprecated 
+8. code-server-notebook-imagestream.yaml
+9. rstudio-notebook-imagestream.yaml
+10. rstudio-gpu-notebook-imagestream.yaml
+11. jupyter-rocm-minimal-notebook-imagestream.yaml
+12. jupyter-rocm-pytorch-notebook-imagestream.yaml
+13. jupyter-rocm-tensorflow-notebook-imagestream.yaml
+
+The order would also be same as `opendatahub.io/notebook-image-order` listed in each imagestreams.  
+*Note*: On deprecation/removal of imagestream, the index of that image is retired with it.
diff --git a/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-gpu-notebook-imagestream.yaml
@@ -18,7 +18,7 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"},{"name": "Notebook","version": "6.5"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n)

diff --git a/manifests/base/jupyter-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-minimal-notebook-imagestream.yaml
@@ -17,7 +17,7 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "4.2"}, {"name": "Notebook","version": "6.5"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "4.2"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/default-image: "true"

diff --git a/manifests/base/jupyter-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -18,7 +18,7 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"},{"name":"PyTorch","version":"2.4"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.17"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.17"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n)

diff --git a/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-minimal-notebook-imagestream.yaml
@@ -8,7 +8,8 @@ metadata:
     opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm"
     opendatahub.io/notebook-image-name: "ROCm"
     opendatahub.io/notebook-image-desc: "Jupyter ROCm notebook image for ODH notebooks."
-    opendatahub.io/notebook-image-order: "9"
+    opendatahub.io/notebook-image-order: "11"
+    opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
   name: jupyter-rocm-minimal
 spec:
   lookupPolicy:
@@ -17,13 +18,13 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"ROCm","version":"6.1"},{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
-        opendatahub.io/notebook-build-commit: $(jupyter-rocm-minimal-notebook-image-commit-n)
+        opendatahub.io/notebook-build-commit: $(odh-rocm-minimal-notebook-image-commit-n)
       from:
         kind: DockerImage
-        name: $(jupyter-rocm-minimal-notebook-image-n)
+        name: $(odh-rocm-minimal-notebook-image-n)
       name: "2024.2"
       referencePolicy:
         type: Source
diff --git a/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-pytorch-notebook-imagestream.yaml
@@ -8,22 +8,23 @@ metadata:
     opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/pytorch"
     opendatahub.io/notebook-image-name: "ROCm-PyTorch"
     opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized PyTorch notebook image for ODH notebooks."
-    opendatahub.io/notebook-image-order: "14"
+    opendatahub.io/notebook-image-order: "12"
+    opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
   name: jupyter-rocm-pytorch
 spec:
   lookupPolicy:
     local: true
   tags:
     # N Version of the image
     - annotations:
-        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"3.0"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"3.0"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-PyTorch","version":"2.4"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-PyTorch","version":"2.4"},{"name":"Tensorboard","version":"2.16"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"2.1"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-rocm-pytorch-notebook-image-commit-n)
       from:
         kind: DockerImage
-        name: $(odh-rocm-pytorch-notebook-image-commit-n)
+        name: $(odh-rocm-pytorch-notebook-image-n)
       name: "2024.2"
       referencePolicy:
         type: Source
diff --git a/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml b/manifests/base/jupyter-rocm-tensorflow-notebook-imagestream.yaml
@@ -8,7 +8,8 @@ metadata:
     opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/rocm/tensorflow"
     opendatahub.io/notebook-image-name: "ROCm-TensorFlow"
     opendatahub.io/notebook-image-desc: "Jupyter ROCm optimized TensorFlow notebook image for ODH notebooks."
-    opendatahub.io/notebook-image-order: "15"
+    opendatahub.io/notebook-image-order: "13"
+    opendatahub.io/recommended-accelerators: '["amd.com/gpu"]'
   name: jupyter-rocm-tensorflow
 spec:
   lookupPolicy:
@@ -17,13 +18,13 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"},{"name":"ROCm-TensorFlow","version":"2.14"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.14"},{"name":"Tensorboard","version":"2.14"},{"name":"Kafka-Python","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"ROCm-TensorFlow","version":"2.14"},{"name":"Tensorboard","version":"2.14"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-rocm-tensorflow-notebook-image-commit-n)
       from:
         kind: DockerImage
-        name: $(odh-rocm-tensorflow-notebook-image-commit-n)
+        name: $(odh-rocm-tensorflow-notebook-image-n)
       name: "2024.2"
       referencePolicy:
         type: Source
diff --git a/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml b/manifests/base/jupyter-tensorflow-notebook-imagestream.yaml
@@ -18,7 +18,7 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"},{"name":"TensorFlow","version":"2.17"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.17"},{"name":"Tensorboard","version":"2.17"},{"name":"Nvidia-CUDA-CU12-Bundle","version":"2.13"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.5"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.18"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.17"},{"name":"Tensorboard","version":"2.17"},{"name":"Nvidia-CUDA-CU12-Bundle","version":"2.13"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.5"},{"name":"Matplotlib","version":"3.9"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-tensorflow-gpu-notebook-image-commit-n)

diff --git a/manifests/base/jupyter-trustyai-notebook-imagestream.yaml b/manifests/base/jupyter-trustyai-notebook-imagestream.yaml
@@ -17,7 +17,7 @@ spec:
     # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.6"},{"name":"Transformers","version":"4.36"},{"name":"Datasets","version":"2.21"},{"name":"Accelerate","version":"0.34"},{"name":"Torch","version":"2.2"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python","version":"2.2"},{"name":"Kfp","version":"2.9"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.5"},{"name":"Scipy","version":"1.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.6"},{"name":"Transformers","version":"4.36"},{"name":"Datasets","version":"2.21"},{"name":"Accelerate","version":"0.34"},{"name":"Torch","version":"2.2"},{"name":"Boto3","version":"1.35"},{"name":"Kafka-Python-ng","version":"2.2"},{"name":"Kfp","version":"2.9"},{"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.14"},{"name":"Odh-Elyra","version":"4.0"},{"name":"PyMongo","version":"4.8"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.17"}, {"name":"Psycopg","version":"3.2"}, {"name":"MySQL Connector/Python","version":"9.0"}]'
         openshift.io/imported-from: quay.io/opendatahub/workbench-images
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-trustyai-notebook-image-commit-n)