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]>
opendatahub-io · Oct 4, 2024 · b0a76a8 · b0a76a8
1 parent 6347ae5
commit b0a76a8
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 32 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-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:
@@ -20,10 +21,10 @@ spec:
         opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
         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,7 +8,8 @@ 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:
@@ -23,7 +24,7 @@ spec:
         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:
@@ -23,7 +24,7 @@ spec:
         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/kustomization.yaml b/manifests/base/kustomization.yaml
@@ -9,8 +9,11 @@ resources:
   - jupyter-tensorflow-notebook-imagestream.yaml
   - jupyter-trustyai-notebook-imagestream.yaml
   - code-server-notebook-imagestream.yaml
-  - rstudio-gpu-notebook-imagestream.yaml
   - rstudio-notebook-imagestream.yaml
+  - rstudio-gpu-notebook-imagestream.yaml
+  - jupyter-rocm-minimal-notebook-imagestream.yaml
+  - jupyter-rocm-pytorch-notebook-imagestream.yaml
+  - jupyter-rocm-tensorflow-notebook-imagestream.yaml
 
 commonLabels:
   opendatahub.io/component: "true"
@@ -38,48 +41,48 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-minimal-notebook-image-n-1
-  - name: odh-minimal-gpu-notebook-image-n
+  - name: odh-generic-data-science-notebook-image-n
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-minimal-gpu-notebook-image-n
-  - name: odh-minimal-gpu-notebook-image-n-1
+      fieldpath: data.odh-generic-data-science-notebook-image-n
+  - name: odh-generic-data-science-notebook-image-n-1
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-minimal-gpu-notebook-image-n-1
-  - name: odh-pytorch-gpu-notebook-image-n
+      fieldpath: data.odh-generic-data-science-notebook-image-n-1
+  - name: odh-minimal-gpu-notebook-image-n
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-pytorch-gpu-notebook-image-n
-  - name: odh-pytorch-gpu-notebook-image-n-1
+      fieldpath: data.odh-minimal-gpu-notebook-image-n
+  - name: odh-minimal-gpu-notebook-image-n-1
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-pytorch-gpu-notebook-image-n-1
-  - name: odh-generic-data-science-notebook-image-n
+      fieldpath: data.odh-minimal-gpu-notebook-image-n-1
+  - name: odh-pytorch-gpu-notebook-image-n
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-generic-data-science-notebook-image-n
-  - name: odh-generic-data-science-notebook-image-n-1
+      fieldpath: data.odh-pytorch-gpu-notebook-image-n
+  - name: odh-pytorch-gpu-notebook-image-n-1
     objref:
       kind: ConfigMap
       name: notebooks-parameters
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-generic-data-science-notebook-image-n-1
+      fieldpath: data.odh-pytorch-gpu-notebook-image-n-1
   - name: odh-tensorflow-gpu-notebook-image-n
     objref:
       kind: ConfigMap
@@ -150,6 +153,27 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-rstudio-gpu-notebook-image-n-1
+  - name: odh-rocm-minimal-notebook-image-n
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-minimal-notebook-image-n
+  - name: odh-rocm-pytorch-notebook-image-n
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-pytorch-notebook-image-n
+  - name: odh-rocm-tensorflow-notebook-image-n
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-tensorflow-notebook-image-n
   - name: odh-minimal-notebook-image-commit-n
     objref:
       kind: ConfigMap
@@ -164,48 +188,48 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-minimal-notebook-image-commit-n-1
-  - name: odh-minimal-gpu-notebook-image-commit-n
+  - name: odh-generic-data-science-notebook-image-commit-n
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-minimal-gpu-notebook-image-commit-n
-  - name: odh-minimal-gpu-notebook-image-commit-n-1
+      fieldpath: data.odh-generic-data-science-notebook-image-commit-n
+  - name: odh-generic-data-science-notebook-image-commit-n-1
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-minimal-gpu-notebook-image-commit-n-1
-  - name: odh-pytorch-gpu-notebook-image-commit-n
+      fieldpath: data.odh-generic-data-science-notebook-image-commit-n-1
+  - name: odh-minimal-gpu-notebook-image-commit-n
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-pytorch-gpu-notebook-image-commit-n
-  - name: odh-pytorch-gpu-notebook-image-commit-n-1
+      fieldpath: data.odh-minimal-gpu-notebook-image-commit-n
+  - name: odh-minimal-gpu-notebook-image-commit-n-1
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-pytorch-gpu-notebook-image-commit-n-1
-  - name: odh-generic-data-science-notebook-image-commit-n
+      fieldpath: data.odh-minimal-gpu-notebook-image-commit-n-1
+  - name: odh-pytorch-gpu-notebook-image-commit-n
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-generic-data-science-notebook-image-commit-n
-  - name: odh-generic-data-science-notebook-image-commit-n-1
+      fieldpath: data.odh-pytorch-gpu-notebook-image-commit-n
+  - name: odh-pytorch-gpu-notebook-image-commit-n-1
     objref:
       kind: ConfigMap
       name: notebook
       apiVersion: v1
     fieldref:
-      fieldpath: data.odh-generic-data-science-notebook-image-commit-n-1
+      fieldpath: data.odh-pytorch-gpu-notebook-image-commit-n-1
   - name: odh-tensorflow-gpu-notebook-image-commit-n
     objref:
       kind: ConfigMap
@@ -276,6 +300,28 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-rstudio-gpu-notebook-image-commit-n-1
+  - name: odh-rocm-minimal-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-minimal-notebook-image-commit-n
+  - name: odh-rocm-pytorch-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-pytorch-notebook-image-commit-n
+  - name: odh-rocm-tensorflow-notebook-image-commit-n
+    objref:
+      kind: ConfigMap
+      name: notebook
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rocm-tensorflow-notebook-image-commit-n
+
 configurations:
   - params.yaml
   - commit.yaml