Skip to content

Commit

Permalink
Updated the notebook manifests with 2024b image references
Browse files Browse the repository at this point in the history
  • Loading branch information
dibryant committed Oct 4, 2024
1 parent cca05d4 commit 43090b6
Show file tree
Hide file tree
Showing 12 changed files with 335 additions and 141 deletions.
79 changes: 57 additions & 22 deletions ci/check-params-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=28
EXPECTED_NUM_RECORDS=35

# ---------------------------- DEFINED FUNCTIONS ----------------------------- #

Expand Down Expand Up @@ -91,143 +91,178 @@ function check_image_variable_matches_name_and_commitref() {
local expected_build_name # Why some of the images has `-amd64` suffix and others not?
case "${image_variable}" in
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"
;;
odh-minimal-notebook-image-n-1)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-notebook-image-n-1)
odh-minimal-notebook-image-n-2)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-notebook-image-n-2)
odh-minimal-notebook-image-n-3)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-notebook-image-n-3)
odh-minimal-notebook-image-n-4)
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
expected_commitref="release-1.2"
expected_build_name="jupyter-minimal-ubi8-python-3.8-amd64"
;;
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"
;;
odh-minimal-gpu-notebook-image-n-1)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-gpu-notebook-image-n-1)
odh-minimal-gpu-notebook-image-n-2)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-gpu-notebook-image-n-2)
odh-minimal-gpu-notebook-image-n-3)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="cuda-jupyter-minimal-ubi9-python-3.9-amd64"
;;
odh-minimal-gpu-notebook-image-n-3)
odh-minimal-gpu-notebook-image-n-4)
expected_name="odh-notebook-jupyter-minimal-ubi8-python-3.8"
expected_commitref="release-1.2"
expected_build_name="cuda-jupyter-minimal-ubi8-python-3.8-amd64"
;;
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"
;;
odh-pytorch-gpu-notebook-image-n-1)
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-pytorch-gpu-notebook-image-n-1)
odh-pytorch-gpu-notebook-image-n-2)
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-pytorch-gpu-notebook-image-n-2)
odh-pytorch-gpu-notebook-image-n-3)
expected_name="odh-notebook-jupyter-pytorch-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="jupyter-pytorch-ubi9-python-3.9-amd64"
;;
odh-pytorch-gpu-notebook-image-n-3)
odh-pytorch-gpu-notebook-image-n-4)
expected_name="odh-notebook-cuda-jupyter-pytorch-ubi8-python-3.8"
expected_commitref="release-1.2"
expected_build_name="jupyter-pytorch-ubi8-python-3.8-amd64"
;;
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"
;;
odh-generic-data-science-notebook-image-n-1)
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
;;
odh-generic-data-science-notebook-image-n-1)
odh-generic-data-science-notebook-image-n-2)
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
;;
odh-generic-data-science-notebook-image-n-2)
odh-generic-data-science-notebook-image-n-3)
expected_name="odh-notebook-jupyter-datascience-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="jupyter-datascience-ubi9-python-3.9-amd64"
;;
odh-generic-data-science-notebook-image-n-3)
odh-generic-data-science-notebook-image-n-4)
expected_name="odh-notebook-jupyter-datascience-ubi8-python-3.8"
expected_commitref="release-1.2"
expected_build_name="jupyter-datascience-ubi8-python-3.8-amd64"
;;
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"
;;
odh-tensorflow-gpu-notebook-image-n-1)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
odh-tensorflow-gpu-notebook-image-n-1)
odh-tensorflow-gpu-notebook-image-n-2)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
odh-tensorflow-gpu-notebook-image-n-2)
odh-tensorflow-gpu-notebook-image-n-3)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="cuda-jupyter-tensorflow-ubi9-python-3.9-amd64"
;;
odh-tensorflow-gpu-notebook-image-n-3)
odh-tensorflow-gpu-notebook-image-n-4)
expected_name="odh-notebook-cuda-jupyter-tensorflow-ubi8-python-3.8"
expected_commitref="release-1.2"
expected_build_name="cuda-jupyter-tensorflow-ubi8-python-3.8-amd64"
;;
odh-trustyai-notebook-image-n)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.11"
expected_commitref="release-2024a"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
;;
odh-trustyai-notebook-image-n-1)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_commitref="release-2024a"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
;;
odh-trustyai-notebook-image-n-2)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
;;
odh-trustyai-notebook-image-n-3)
expected_name="odh-notebook-jupyter-trustyai-ubi9-python-3.9"
expected_commitref="release-2023a"
expected_build_name="jupyter-trustyai-ubi9-python-3.9-amd64"
;;
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"
;;
odh-codeserver-notebook-image-n-1)
expected_name="odh-notebook-code-server-ubi9-python-3.9"
expected_commitref="release-2024a"
expected_build_name="codeserver-ubi9-python-3.9-amd64"
;;
odh-codeserver-notebook-image-n-1)
odh-codeserver-notebook-image-n-2)
expected_name="odh-notebook-code-server-ubi9-python-3.9"
expected_commitref="release-2023b"
expected_build_name="codeserver-ubi9-python-3.9-amd64"
;;
odh-rocm-minimal-notebook-image-n)
expected_name="odh-notebook-jupyter-minimal-ubi9-python-3.11"
expected_commitref="release-2024b"
expected_commitref="release-2024b"
expected_build_name="rocm-jupyter-minimal-ubi9-python-3.11-amd64"
;;
odh-rocm-pytorch-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-pytorch-ubi9-python-3.11"
expected_commitref="release-2024b"
expected_commitref="release-2024b"
expected_build_name="rocm-jupyter-pytorch-ubi9-python-3.11-amd64"
;;
odh-rocm-tensorflow-notebook-image-n)
expected_name="odh-notebook-jupyter-rocm-tensorflow-ubi9-python-3.11"
expected_commitref="release-2024b"
expected_commitref="release-2024b"
expected_build_name="rocm-jupyter-tensorflow-ubi9-python-3.11-amd64"
;;
*)
Expand Down
25 changes: 19 additions & 6 deletions manifests/base/code-server-notebook-imagestream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,42 @@ spec:
lookupPolicy:
local: true
tags:
# N Version of the image
# N Version of the image

Check warning on line 17 in manifests/base/code-server-notebook-imagestream.yaml

View workflow job for this annotation

GitHub Actions / code-static-analysis

17:4 [comments-indentation] comment not indented like content
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.22"}]'
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.11"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.92"}]'
openshift.io/imported-from: quay.io/modh/codeserver
opendatahub.io/workbench-image-recommended: "true"
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n)
from:
kind: DockerImage
name: $(odh-codeserver-notebook-image-n)
name: "2024.1"
name: "2024.2"
referencePolicy:
type: Source
# N - 1 Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.16"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.22"}]'
openshift.io/imported-from: quay.io/modh/codeserver
opendatahub.io/workbench-image-recommended: 'false'
opendatahub.io/workbench-image-recommended: "false"
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n-1)
from:
kind: DockerImage
name: $(odh-codeserver-notebook-image-n-1)
name: "2024.1"
referencePolicy:
type: Source
# N - 2 Version of the image
- annotations:
opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
opendatahub.io/notebook-python-dependencies: '[{"name":"code-server","version":"4.16"}]'
openshift.io/imported-from: quay.io/modh/codeserver
opendatahub.io/image-tag-outdated: 'true'
opendatahub.io/notebook-build-commit: $(odh-codeserver-notebook-image-commit-n-2)
from:
kind: DockerImage
name: $(odh-codeserver-notebook-image-n-2)
name: "2023.2"
referencePolicy:
type: Source
57 changes: 32 additions & 25 deletions manifests/base/commit.env
Original file line number Diff line number Diff line change
@@ -1,28 +1,35 @@
odh-minimal-notebook-image-commit-n=b5a8318
odh-minimal-notebook-image-commit-n-1=76a016f
odh-minimal-notebook-image-commit-n-2=07015ec
odh-minimal-notebook-image-commit-n-3=3e71410
odh-minimal-gpu-notebook-image-commit-n=b5a8318
odh-minimal-gpu-notebook-image-commit-n-1=76a016f
odh-minimal-gpu-notebook-image-commit-n-2=07015ec
odh-minimal-gpu-notebook-image-commit-n-3=3e71410
odh-pytorch-gpu-notebook-image-commit-n=b5a8318
odh-pytorch-gpu-notebook-image-commit-n-1=76a016f
odh-pytorch-gpu-notebook-image-commit-n-2=07015ec
odh-pytorch-gpu-notebook-image-commit-n-3=3e71410
odh-generic-data-science-notebook-image-commit-n=b5a8318
odh-generic-data-science-notebook-image-commit-n-1=76a016f
odh-generic-data-science-notebook-image-commit-n-2=07015ec
odh-generic-data-science-notebook-image-commit-n-3=3e71410
odh-tensorflow-gpu-notebook-image-commit-n=b5a8318
odh-tensorflow-gpu-notebook-image-commit-n-1=76a016f
odh-tensorflow-gpu-notebook-image-commit-n-2=07015ec
odh-tensorflow-gpu-notebook-image-commit-n-3=3e71410
odh-trustyai-notebook-image-commit-n=b5a8318
odh-trustyai-notebook-image-commit-n-1=76a016f
odh-trustyai-notebook-image-commit-n-2=07015ec
odh-codeserver-notebook-image-commit-n=b5a8318
odh-codeserver-notebook-image-commit-n-1=76a016f
odh-minimal-notebook-image-commit-n=31ad6bc
odh-minimal-notebook-image-commit-n-1=b5a8318
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-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-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-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-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-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-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
28 changes: 28 additions & 0 deletions manifests/base/commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-minimal-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-minimal-notebook-image-commit-n-4
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -32,6 +36,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-minimal-gpu-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-minimal-gpu-notebook-image-commit-n-4
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -48,6 +56,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-pytorch-gpu-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-pytorch-gpu-notebook-image-commit-n-4
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -64,6 +76,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-generic-data-science-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-generic-data-science-notebook-image-commit-n-4
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -80,6 +96,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-tensorflow-gpu-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-tensorflow-gpu-notebook-image-commit-n-4
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -92,6 +112,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-trustyai-notebook-image-commit-n-2
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-trustyai-notebook-image-commit-n-3
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand All @@ -100,6 +124,10 @@ varReference:
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-codeserver-notebook-image-commit-n-1
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
name: odh-codeserver-notebook-image-commit-n-2
- path: spec/tags[]/annotations/opendatahub.io\/notebook-build-commit
kind: ImageStream
apiGroup: image.openshift.io/v1
Expand Down
Loading

0 comments on commit 43090b6

Please sign in to comment.