Merge pull request #686 from opendatahub-io/sync__main__2024a__20240826104809

Sync `2024a` branch with `main` branch

Author: harshad16

.github/workflows/code-quality.yaml

@@ -116,16 +116,23 @@ jobs:
           echo "Hadolint done"
 
       # This simply checks that the manifests and respective kustomization.yaml finishes without an error.
+      # Version of the kustomize that operator use in runtime to apply these changes is determined by:
+      # https://github.com/red-hat-data-services/rhods-operator/blob/7ccc405135f99c014982d7e297b8949e970dd750/go.mod#L28-L29
+      # and then to match appropriate kustomize release https://github.com/kubernetes-sigs/kustomize/releases/tag/kustomize%2Fv5.0.2
       - name: Check kustomize manifest
         id: kustomize-manifests
         run: |
-          kubectl version --client=true
+          KUSTOMIZE_VERSION=5.0.2
+          wget "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz"
+          tar -xvf kustomize*
+
+          ./kustomize version
           echo "----------------------------------------------------------"
-          echo "Starting 'kubectl kustomize manifests/base'"
+          echo "Starting './kustomize build manifests/base'"
           echo "----------------------------------------------------------"
-          kubectl kustomize manifests/base
+          ./kustomize build manifests/base
 
           echo "----------------------------------------------------------"
-          echo "Starting 'kubectl kustomize manifests/overlays/additional'"
+          echo "Starting './kustomize build manifests/overlays/additional'"
           echo "----------------------------------------------------------"
-          kubectl kustomize manifests/overlays/additional
+          ./kustomize build manifests/overlays/additional

.github/workflows/runtimes-digest-updater-upstream.yaml

@@ -78,23 +78,29 @@ jobs:
             "jupyter/datascience/ubi9-python-3.9/runtime-images/datascience-ubi9-py39.json"
             "jupyter/datascience/ubi9-python-3.9/runtime-images/pytorch-ubi9-py39.json"
             "jupyter/datascience/ubi9-python-3.9/runtime-images/tensorflow-ubi9-py39.json"
-            "jupyter/datascience/ubi9-python-3.9/runtime-images/ubi9-py39.json")
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/ubi9-py39.json"
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/rocm-tensorflow-ubi9-py39.json"
+            "jupyter/datascience/ubi9-python-3.9/runtime-images/rocm-pytorch-ubi9-py39.json")
 
             for ((i=0;i<${#PATHS[@]};++i)); do
               path=${PATHS[$i]}
               img=$(cat ${path} | jq -r '.metadata.image_name')
               name=$(echo "$path" | sed 's#.*runtime-images/\(.*\)-py.*#\1#')
               py_version=$(echo "$path" | grep -o 'python-[0-9]\.[0-9]')
               # Handling specific cases
-              if [[ $name == *tensorflow* ]]; then
+              if [[ $name == tensorflow* ]]; then
                   name="cuda-$name"
               elif [[ $name == ubi* ]]; then
                   name="minimal-$name"
               fi
               registry=$(echo $img | cut -d '@' -f1)
               regex="^runtime-$name-$py_version-${{ env.RELEASE_VERSION_N}}-\d+-${{ steps.hash-n.outputs.HASH_N }}\$"
-              echo "CHECKING: "  $regex
               latest_tag=$(skopeo inspect docker://$img | jq -r --arg regex "$regex" '.RepoTags | map(select(. | test($regex))) | .[0]')
+              echo "CHECKING: "  $latest_tag
+              if [[ -z "$latest_tag" ]]; then
+                echo "No matching tag found"
+                exit 1
+              fi
               digest=$(skopeo inspect docker://$registry:$latest_tag | jq .Digest | tr -d '"')
               output=$registry@$digest
               echo "NEW: " $output

README.md

@@ -6,7 +6,7 @@
 
 Welcome to the OpenDataHub Notebooks repository! This repository provides a collection of notebooks tailored for data analysis, machine learning, research and coding within the OpenDataHub ecosystem. Designed to streamline data science workflows, these notebooks offer an integrated environment equipped with the latest tools and libraries. These notebooks were created to be used with OpenDataHub ecosystem with the ODH Notebook Controller as the launcher.
 
-These workbenches are available at: [quay.io/opendatahub/workbench-images](https://quay.io/opendatahub/workbench-images)
+These workbenches are available at: [quay.io/repository/opendatahub/workbench-images](https://quay.io/repository/opendatahub/workbench-images)
 
 ## Getting Started
 For a deeper understanding of the architecture underlying this repository, please explore our wiki page [Wiki](https://github.com/opendatahub-io/notebooks/wiki/Workbenches)

ci/check-params-env.sh

@@ -25,7 +25,7 @@ PARAMS_ENV_PATH="manifests/base/params.env"
 
 # This value needs to be updated everytime we deliberately change number of the
 # images we want to have in the `params.env` file.
-EXPECTED_NUM_RECORDS=20
+EXPECTED_NUM_RECORDS=23
 
 # ---------------------------- DEFINED FUNCTIONS ----------------------------- #
 
@@ -193,6 +193,21 @@ function check_image_variable_matches_name_and_commitref() {
             expected_commitref="2023b"
             expected_build_name="cuda-rstudio-c9s-python-3.9-amd64"
             ;;
+        odh-rocm-minimal-notebook-image-n)
+            expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-minimal-ubi9-python-3.9-amd64"
+            ;;
+        odh-rocm-pytorch-notebook-image-n)
+            expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.9-amd64"
+            ;;
+        odh-rocm-tensorflow-notebook-image-n)
+            expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.9"
+            expected_commitref="2024a"
+            expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.9-amd64"
+            ;;
         *)
             echo "Unimplemented variable name: '${image_variable}'"
             return 1

intel/runtimes/ml/ubi9-python-3.9/Pipfile

@@ -20,7 +20,7 @@ plotly = "~=5.16.1"
 scipy = "~=1.11.2"
 scikit-learn = "~=1.3.1"
 skl2onnx = "~=1.15.0"
-codeflare-sdk = "~=0.16.3"
+codeflare-sdk = "~=0.19.1"
 # DB connectors
 pymongo = "~=4.5.0"
 psycopg = "~=3.1.10"