Merge pull request opendatahub-io#398 from harshad16/rhoai-adjust-manifest

Sync with upstream main and updated the image sha for 2.14 code freeze

Author: harshad16

ci/check-params-env.sh

@@ -93,7 +93,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-minimal-notebook-image-n)
             expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
+            expected_build_name="jupyter-minimal-ubi9-python-3.11-amd64"
             ;;
         odh-minimal-notebook-image-n-1)
             expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
@@ -118,7 +118,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-minimal-gpu-notebook-image-n)
             expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
+            expected_build_name="cuda-jupyter-minimal-ubi9-python-3.11-amd64"
             ;;
         odh-minimal-gpu-notebook-image-n-1)
             expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
@@ -143,7 +143,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-pytorch-gpu-notebook-image-n)
             expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
+            expected_build_name="jupyter-pytorch-ubi9-python-3.11-amd64"
             ;;
         odh-pytorch-gpu-notebook-image-n-1)
             expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
@@ -168,7 +168,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-generic-data-science-notebook-image-n)
             expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
+            expected_build_name="jupyter-datascience-ubi9-python-3.11-amd64"
             ;;
         odh-generic-data-science-notebook-image-n-1)
             expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
@@ -193,7 +193,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-tensorflow-gpu-notebook-image-n)
             expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
+            expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.11-amd64"
             ;;
         odh-tensorflow-gpu-notebook-image-n-1)
             expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
@@ -217,8 +217,8 @@ function check_image_variable_matches_name_and_commitref() {
             ;;
         odh-trustyai-notebook-image-n)
             expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
-            expected_commitref="release-2024a"
-            expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
+            expected_commitref="release-2024b"
+            expected_build_name="jupyter-trustyai-ubi9-python-3.11-amd64"
             ;;
         odh-trustyai-notebook-image-n-1)
             expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
@@ -238,7 +238,7 @@ function check_image_variable_matches_name_and_commitref() {
         odh-codeserver-notebook-image-n)
             expected_name="odh-notebook-code-server-ubi9-python-3.11"
             expected_commitref="release-2024b"
-            expected_build_name="codeserver-ubi9-python-3.9-amd64"
+            expected_build_name="codeserver-ubi9-python-3.11-amd64"
             ;;
         odh-codeserver-notebook-image-n-1)
             expected_name="odh-notebook-code-server-ubi9-python-3.9"

manifests/base/README.md

@@ -0,0 +1,18 @@
+# IDE Imagestreams
+
+Listing the order in which each imagestreams are introduced.
+
+10. jupyter-minimal-notebook-imagestream.yaml
+20. jupyter-datascience-notebook-imagestream.yaml
+30. jupyter-minimal-gpu-notebook-imagestream.yaml
+40. jupyter-pytorch-notebook-imagestream.yaml
+50. jupyter-tensorflow-notebook-imagestream.yaml
+60. jupyter-trustyai-notebook-imagestream.yaml
+70. ~~jupyter-habana-notebook-imagestream.yaml~~ # Deprecated 
+80. code-server-notebook-imagestream.yaml
+90. jupyter-rocm-minimal-notebook-imagestream.yaml
+91. jupyter-rocm-pytorch-notebook-imagestream.yaml
+92. 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.

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

@@ -14,7 +14,7 @@ spec:
   lookupPolicy:
     local: true
   tags:
-   # N Version of the image
+    # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
         opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.92"}]'

manifests/base/commit.env

@@ -1,35 +1,35 @@
-odh-minimal-notebook-image-commit-n=31ad6bc
-odh-minimal-notebook-image-commit-n-1=b5a8318
+odh-minimal-notebook-image-commit-n=69688c1
+odh-minimal-notebook-image-commit-n-1=66ff88f
 odh-minimal-notebook-image-commit-n-2=76a016f
 odh-minimal-notebook-image-commit-n-3=07015ec
 odh-minimal-notebook-image-commit-n-4=3e71410
-odh-minimal-gpu-notebook-image-commit-n=31ad6bc
-odh-minimal-gpu-notebook-image-commit-n-1=b5a8318
+odh-minimal-gpu-notebook-image-commit-n=69688c1
+odh-minimal-gpu-notebook-image-commit-n-1=66ff88f
 odh-minimal-gpu-notebook-image-commit-n-2=76a016f
 odh-minimal-gpu-notebook-image-commit-n-3=07015ec
 odh-minimal-gpu-notebook-image-commit-n-4=3e71410
-odh-pytorch-gpu-notebook-image-commit-n=31ad6bc
-odh-pytorch-gpu-notebook-image-commit-n-1=b5a8318
+odh-pytorch-gpu-notebook-image-commit-n=69688c1
+odh-pytorch-gpu-notebook-image-commit-n-1=66ff88f
 odh-pytorch-gpu-notebook-image-commit-n-2=76a016f
 odh-pytorch-gpu-notebook-image-commit-n-3=07015ec
 odh-pytorch-gpu-notebook-image-commit-n-4=3e71410
-odh-generic-data-science-notebook-image-commit-n=31ad6bc
-odh-generic-data-science-notebook-image-commit-n-1=b5a8318
+odh-generic-data-science-notebook-image-commit-n=69688c1
+odh-generic-data-science-notebook-image-commit-n-1=66ff88f
 odh-generic-data-science-notebook-image-commit-n-2=76a016f
 odh-generic-data-science-notebook-image-commit-n-3=07015ec
 odh-generic-data-science-notebook-image-commit-n-4=3e71410
-odh-tensorflow-gpu-notebook-image-commit-n=31ad6bc
-odh-tensorflow-gpu-notebook-image-commit-n-1=b5a8318
+odh-tensorflow-gpu-notebook-image-commit-n=69688c1
+odh-tensorflow-gpu-notebook-image-commit-n-1=66ff88f
 odh-tensorflow-gpu-notebook-image-commit-n-2=76a016f
 odh-tensorflow-gpu-notebook-image-commit-n-3=07015ec
 odh-tensorflow-gpu-notebook-image-commit-n-4=3e71410
-odh-trustyai-notebook-image-commit-n=31ad6bc
-odh-trustyai-notebook-image-commit-n-1=b5a8318
+odh-trustyai-notebook-image-commit-n=69688c1
+odh-trustyai-notebook-image-commit-n-1=66ff88f
 odh-trustyai-notebook-image-commit-n-2=76a016f
 odh-trustyai-notebook-image-commit-n-3=07015ec
-odh-codeserver-notebook-image-commit-n=31ad6bc
-odh-codeserver-notebook-image-commit-n-1=b5a8318
+odh-codeserver-notebook-image-commit-n=69688c1
+odh-codeserver-notebook-image-commit-n-1=66ff88f
 odh-codeserver-notebook-image-commit-n-2=76a016f
-odh-rocm-minimal-notebook-image-commit-n=31ad6bc
-odh-rocm-pytorch-notebook-image-commit-n=31ad6bc
-odh-rocm-tensorflow-notebook-image-commit-n=31ad6bc
+odh-rocm-minimal-notebook-image-commit-n=69688c1
+odh-rocm-pytorch-notebook-image-commit-n=69688c1
+odh-rocm-tensorflow-notebook-image-commit-n=69688c1

manifests/base/cuda-rstudio-buildconfig.yaml

@@ -52,7 +52,7 @@ spec:
       noCache: true
       from:
         kind: "DockerImage"
-        name: "quay.io/modh/odh-base-rhel9:base-rhel9-python-3.9-20240131-378dafd"
+        name: "quay.io/modh/odh-base-rhel9@sha256:1d6f2e3c0ee7962d92c3b933f3bbfabeee24d314a2ce5f8ec2d9f18d5b6723d4"
       volumes:
         - name: secret-mvn
           source:

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

@@ -14,10 +14,10 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
+    # N Version of the image
     - annotations:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.34"},{"name":"Kafka-Python-ng","version":"2.0"},{"name":"Kfp","version":"2.8"},{"name":"Matplotlib","version":"3.8"},{"name":"Numpy","version":"1.26"},{"name":"Pandas","version":"2.2"},{"name":"Scikit-learn","version":"1.4"},{"name":"Scipy","version":"1.12"},{"name":"Odh-Elyra","version":"3.16"},{"name":"PyMongo","version":"4.6"},{"name":"Pyodbc","version":"5.1"}, {"name":"Codeflare-SDK","version":"0.21"}, {"name":"Sklearn-onnx","version":"1.16"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.3"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"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/modh/odh-generic-data-science-notebook
         opendatahub.io/workbench-image-recommended: "true"
         opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n)
@@ -36,7 +36,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-1)
       from:
         kind: DockerImage
-        name: $(odh-generic-data-science-notebook-image-n)
+        name: $(odh-generic-data-science-notebook-image-n-1)
       name: "2024.1"
       referencePolicy:
         type: Source
@@ -49,7 +49,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-2)
       from:
         kind: DockerImage
-        name: $(odh-generic-data-science-notebook-image-n-1)
+        name: $(odh-generic-data-science-notebook-image-n-2)
       name: "2023.2"
       referencePolicy:
         type: Source
@@ -62,7 +62,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-3)
       from:
         kind: DockerImage
-        name: $(odh-generic-data-science-notebook-image-n-2)
+        name: $(odh-generic-data-science-notebook-image-n-3)
       name: "2023.1"
       referencePolicy:
         type: Source
@@ -75,7 +75,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-generic-data-science-notebook-image-commit-n-4)
       from:
         kind: DockerImage
-        name: $(odh-generic-data-science-notebook-image-n-3)
+        name: $(odh-generic-data-science-notebook-image-n-4)
       name: "1.2"
       referencePolicy:
         type: Source

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

@@ -15,10 +15,10 @@ spec:
   lookupPolicy:
     local: true
   tags:
-   # N Version of the image
+    # N Version of the image
     - annotations:
-        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.1"},{"name":"Python","version":"v3.11"}]'
-        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name": "Notebook","version": "6.5"}]'
+        opendatahub.io/notebook-software: '[{"name":"CUDA","version":"12.4"},{"name":"Python","version":"v3.11"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"4.2"}]'
         openshift.io/imported-from: quay.io/modh/cuda-notebooks
         opendatahub.io/workbench-image-recommended: "true"
         opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n)
@@ -63,7 +63,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-3)
       from:
         kind: DockerImage
-        name: $(odh-minimal-gpu-notebook-image-n-2)
+        name: $(odh-minimal-gpu-notebook-image-n-3)
       name: "2023.1"
       referencePolicy:
         type: Source
@@ -76,7 +76,7 @@ spec:
         opendatahub.io/notebook-build-commit: $(odh-minimal-gpu-notebook-image-commit-n-4)
       from:
         kind: DockerImage
-        name: $(odh-minimal-gpu-notebook-image-n-3)
+        name: $(odh-minimal-gpu-notebook-image-n-4)
       name: "1.2"
       referencePolicy:
         type: Source

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

@@ -14,10 +14,10 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
+    # 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/modh/odh-minimal-notebook-container
         opendatahub.io/workbench-image-recommended: "true"
         opendatahub.io/default-image: "true"
@@ -44,7 +44,7 @@ spec:
         opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
         opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.6"}, {"name": "Notebook","version": "6.5"}]'
         openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container
-        opendatahub.io/image-tag-outdated: "false"
+        opendatahub.io/image-tag-outdated: "true"
         opendatahub.io/notebook-build-commit: $(odh-minimal-notebook-image-commit-n-2)
       from:
         kind: DockerImage

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

@@ -15,10 +15,10 @@ spec:
   lookupPolicy:
     local: true
   tags:
-  # N Version of the image
+    # 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/modh/odh-pytorch-notebook
         opendatahub.io/workbench-image-recommended: "true"
         opendatahub.io/notebook-build-commit: $(odh-pytorch-gpu-notebook-image-commit-n)

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

@@ -18,7 +18,7 @@ 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/modh/rocm-notebooks
         opendatahub.io/workbench-image-recommended: 'true'
         opendatahub.io/notebook-build-commit: $(odh-rocm-minimal-notebook-image-commit-n)