From d8fa880182a44f4e0e1a28cc64a6fb08543d555c Mon Sep 17 00:00:00 2001 From: Harshad Reddy Nalla Date: Sat, 21 Oct 2023 11:44:02 -0400 Subject: [PATCH] Upgrade the notebook images with 2023b and 2023a images Signed-off-by: Harshad Reddy Nalla --- ...ric-data-science-notebook-imagestream.yaml | 58 ++++---- .../habana-notebook-imagestream.yaml | 45 +++--- .../overlays/additional/kustomization.yaml | 46 ++++++- .../minimal-gpu-notebook-imagestream.yaml | 46 ++++--- .../minimal-notebook-imagestream.yaml | 60 ++++---- .../overlays/additional/params.env | 28 ++-- .../overlays/additional/params.yaml | 129 +++++++++++------- .../pytorch-notebook-imagestream.yaml | 52 ++++--- .../tensorflow-notebook-imagestream.yaml | 52 ++++--- .../trustyai-notebook-imagestream.yaml | 35 +++-- 10 files changed, 349 insertions(+), 202 deletions(-) diff --git a/jupyterhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml index 16b6ac28d..e6e79e772 100644 --- a/jupyterhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/generic-data-science-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -13,26 +14,37 @@ spec: lookupPolicy: local: true tags: - # N Version of the image (v2-2023a-20230526-c4c062e) - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra,"version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook - opendatahub.io/workbench-image-recommended: 'true' - from: - kind: DockerImage - name: $(odh-generic-data-science-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source - # N-1 Version of the image - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]' - openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook - from: - kind: DockerImage - name: $(odh-generic-data-science-notebook-image-n-1) - name: "1.2" - referencePolicy: - type: Source + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]' + openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook + opendatahub.io/workbench-image-recommended: 'true' + from: + kind: DockerImage + name: $(odh-generic-data-science-notebook-image-n) + name: "2023.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":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook + from: + kind: DockerImage + name: $(odh-generic-data-science-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source + # N-2 Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]' + openshift.io/imported-from: quay.io/modh/odh-generic-data-science-notebook + from: + kind: DockerImage + name: $(odh-generic-data-science-notebook-image-n-2) + name: "1.2" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/habana-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/habana-notebook-imagestream.yaml index f596a2a0f..8333d0563 100644 --- a/jupyterhub/notebook-images/overlays/additional/habana-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/habana-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -14,25 +15,25 @@ spec: lookupPolicy: local: true tags: - # 1.11.0 Version of the image n - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.11"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.1"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/odh-habana-notebooks - from: - kind: DockerImage - name: $(odh-habana-notebook-image-n) - name: "2023.2" - referencePolicy: - type: Source - # 1.10.0 Version of the image n-1 - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/odh-habana-notebooks - from: - kind: DockerImage - name: $(odh-habana-notebook-image-n-1) - name: "2023.1" - referencePolicy: - type: Source \ No newline at end of file + # 1.11.0 Version of the image n + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.11"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.1"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/odh-habana-notebooks + from: + kind: DockerImage + name: $(odh-habana-notebook-image-n) + name: "2023.2" + referencePolicy: + type: Source + # 1.10.0 Version of the image n-1 + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"},{"name":"Habana","version":"1.10"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.23"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.2"},{"name":"Scipy","version":"1.10"},{"name":"Tensorflow","version":"2.12.0"},{"name":"PyTorch","version":"2.0.1"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/odh-habana-notebooks + from: + kind: DockerImage + name: $(odh-habana-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/kustomization.yaml b/jupyterhub/notebook-images/overlays/additional/kustomization.yaml index da438460b..38855ab7b 100644 --- a/jupyterhub/notebook-images/overlays/additional/kustomization.yaml +++ b/jupyterhub/notebook-images/overlays/additional/kustomization.yaml @@ -1,8 +1,8 @@ +--- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -bases: -- ../../base resources: +- ../../base - minimal-notebook-imagestream.yaml - generic-data-science-notebook-imagestream.yaml - habana-notebook-imagestream.yaml @@ -35,6 +35,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-minimal-notebook-image-n-1 + - name: odh-minimal-notebook-image-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-minimal-notebook-image-n-2 - name: odh-minimal-gpu-notebook-image-n objref: kind: ConfigMap @@ -49,6 +56,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-minimal-gpu-notebook-image-n-1 + - name: odh-minimal-gpu-notebook-image-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-minimal-gpu-notebook-image-n-2 - name: odh-pytorch-gpu-notebook-image-n objref: kind: ConfigMap @@ -63,6 +77,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-pytorch-gpu-notebook-image-n-1 + - name: odh-pytorch-gpu-notebook-image-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-pytorch-gpu-notebook-image-n-2 - name: odh-generic-data-science-notebook-image-n objref: kind: ConfigMap @@ -77,6 +98,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-generic-data-science-notebook-image-n-1 + - name: odh-generic-data-science-notebook-image-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-generic-data-science-notebook-image-n-2 - name: odh-tensorflow-gpu-notebook-image-n objref: kind: ConfigMap @@ -91,6 +119,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-tensorflow-gpu-notebook-image-n-1 + - name: odh-tensorflow-gpu-notebook-image-n-2 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-tensorflow-gpu-notebook-image-n-2 - name: odh-trustyai-notebook-image-n objref: kind: ConfigMap @@ -98,6 +133,13 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-trustyai-notebook-image-n + - name: odh-trustyai-notebook-image-n-1 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-trustyai-notebook-image-n-1 - name: odh-habana-notebook-image-n objref: kind: ConfigMap diff --git a/jupyterhub/notebook-images/overlays/additional/minimal-gpu-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/minimal-gpu-notebook-imagestream.yaml index f7e05cf5d..5b58973ac 100644 --- a/jupyterhub/notebook-images/overlays/additional/minimal-gpu-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/minimal-gpu-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -14,26 +15,37 @@ spec: lookupPolicy: local: true tags: - # N Version of the image (2023a-20230526-c4c062e) - - annotations: + # N Version of the image + - annotations: opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name":"Notebook","version":"6.5"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.6"},{"name":"Notebook","version":"6.5"}]' openshift.io/imported-from: quay.io/modh/cuda-notebooks opendatahub.io/workbench-image-recommended: 'true' - from: - kind: DockerImage - name: $(odh-minimal-gpu-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source - # N-1 Version of the image - - annotations: + from: + kind: DockerImage + name: $(odh-minimal-gpu-notebook-image-n) + name: "2023.2" + referencePolicy: + type: Source + # N-1 Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.5"},{"name":"Notebook","version":"6.5"}]' + openshift.io/imported-from: quay.io/modh/cuda-notebooks + from: + kind: DockerImage + name: $(odh-minimal-gpu-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source + # N-2 Version of the image + - annotations: opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.2"},{"name":"Notebook","version":"6.4"}]' openshift.io/imported-from: quay.io/modh/cuda-notebooks - from: - kind: DockerImage - name: $(odh-minimal-gpu-notebook-image-n-1) - name: "1.2" - referencePolicy: - type: Source + from: + kind: DockerImage + name: $(odh-minimal-gpu-notebook-image-n-2) + name: "1.2" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml index 6a5c66d39..7df5e0798 100644 --- a/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/minimal-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -13,27 +14,38 @@ spec: lookupPolicy: local: true tags: - # N Version of the image (v2-2023a-20230526-c4c062e) - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]' - openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container - opendatahub.io/workbench-image-recommended: 'true' - opendatahub.io/default-image: "true" - from: - kind: DockerImage - name: $(odh-minimal-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source - # N-1 Version of the image - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]' - openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container - from: - kind: DockerImage - name: $(odh-minimal-notebook-image-n-1) - name: "1.2" - referencePolicy: - type: Source + # N Version of the image + - annotations: + 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/workbench-image-recommended: 'true' + opendatahub.io/default-image: "true" + from: + kind: DockerImage + name: $(odh-minimal-notebook-image-n) + name: "2023.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":"JupyterLab","version": "3.5"}, {"name": "Notebook","version": "6.5"}]' + openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container + from: + kind: DockerImage + name: $(odh-minimal-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source + # N-2 Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version": "3.2"}, {"name": "Notebook","version": "6.4"}]' + openshift.io/imported-from: quay.io/modh/odh-minimal-notebook-container + from: + kind: DockerImage + name: $(odh-minimal-notebook-image-n-2) + name: "1.2" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/params.env b/jupyterhub/notebook-images/overlays/additional/params.env index b1f513142..c5fcf4439 100644 --- a/jupyterhub/notebook-images/overlays/additional/params.env +++ b/jupyterhub/notebook-images/overlays/additional/params.env @@ -1,13 +1,19 @@ -odh-minimal-notebook-image-n=quay.io/modh/odh-minimal-notebook-container@sha256:7301724b5980f96627cfe6e265900a5b145a677c1fac0357953de49fd8772069 -odh-minimal-notebook-image-n-1=quay.io/modh/odh-minimal-notebook-container@sha256:a5a7738b09a204804e084a45f96360b568b0b9d85709c0ce6742d440ff917183 -odh-minimal-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:801b3f40e1c39abd0cf9b20a945349fd38754861e2638e2685df1736a3280377 -odh-minimal-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:348fa993347f86d1e0913853fb726c584ae8b5181152f0430967d380d68d804f -odh-pytorch-gpu-notebook-image-n=quay.io/modh/odh-pytorch-notebook@sha256:cda0c540d4446cd42d31bc52917dec109f112e4676806504cf56859947b0dd14 -odh-pytorch-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:492c37fb4b71c07d929ac7963896e074871ded506230fe926cdac21eb1ab9db8 -odh-generic-data-science-notebook-image-n=quay.io/modh/odh-generic-data-science-notebook@sha256:66bab4b261407c9913fdf6f33a4a63ff47369ebeebc934106722c3fe90cc5298 -odh-generic-data-science-notebook-image-n-1=quay.io/modh/odh-generic-data-science-notebook@sha256:ebb5613e6b53dc4e8efcfe3878b4cd10ccb77c67d12c00d2b8c9d41aeffd7df5 -odh-tensorflow-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:9dfc60575154eb58e22577ae7287bb61d2145eb0129a36c446c43bf54f1136b5 -odh-tensorflow-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:2163ba74f602ec4b3049a88dcfa4fe0a8d0fff231090001947da66ef8e75ab9a -odh-trustyai-notebook-image-n=quay.io/modh/odh-trustyai-notebook@sha256:b8a351d77d54b1fbf469885002e0db2a6649b605ff8c2c5bb2056709304b6db0 +odh-minimal-notebook-image-n=quay.io/modh/odh-minimal-notebook-container@sha256:a942ab984181b1ea0bffec92473995bbb1488d65a4d1b64717385f49bfd0adf4 +odh-minimal-notebook-image-n-1=quay.io/modh/odh-minimal-notebook-container@sha256:565566bcae219a28cfc189e4ca60c542e93f9a492608ac7066b8de76db11bc76 +odh-minimal-notebook-image-n-2=quay.io/modh/odh-minimal-notebook-container@sha256:a5a7738b09a204804e084a45f96360b568b0b9d85709c0ce6742d440ff917183 +odh-minimal-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:516dbbabff93200a9245f66d32b19ed0706c7cd52f866f7e82e197b33d10a2d6 +odh-minimal-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:b68775065fef75814af1fbd78de785678c0375ee3183fb73f4dc716581b95157 +odh-minimal-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:348fa993347f86d1e0913853fb726c584ae8b5181152f0430967d380d68d804f +odh-pytorch-gpu-notebook-image-n=quay.io/modh/odh-pytorch-notebook@sha256:3da114e8a1ac3ecbc7bbae8c46d96f38dceb1925b777db319c5fb04a2f27ef89 +odh-pytorch-gpu-notebook-image-n-1=quay.io/modh/odh-pytorch-notebook@sha256:aae4210015d79db3ee8f44b34ad7b911bab3e9448aea6e2514eca71d98c2e9b7 +odh-pytorch-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:492c37fb4b71c07d929ac7963896e074871ded506230fe926cdac21eb1ab9db8 +odh-generic-data-science-notebook-image-n=quay.io/modh/odh-generic-data-science-notebook@sha256:9e16f32bac3a3191dd35fdf0710a1d353585df7cc320595fe6b073030057f5ab +odh-generic-data-science-notebook-image-n-1=quay.io/modh/odh-generic-data-science-notebook@sha256:12f3b13d6bb6edc5d46adfbfbdbb20e457bf45094c07f1f4f3f9a05648939a58 +odh-generic-data-science-notebook-image-n-2=quay.io/modh/odh-generic-data-science-notebook@sha256:ebb5613e6b53dc4e8efcfe3878b4cd10ccb77c67d12c00d2b8c9d41aeffd7df5 +odh-tensorflow-gpu-notebook-image-n=quay.io/modh/cuda-notebooks@sha256:660e2bba824b63bbfe3597a5396aa4e8c5408c10cf88c5b85cea8426c73d7ca4 +odh-tensorflow-gpu-notebook-image-n-1=quay.io/modh/cuda-notebooks@sha256:5943f22d622dc14ec71bbebf86b554dd9ff333db072c54777aa60c4da65e0a3b +odh-tensorflow-gpu-notebook-image-n-2=quay.io/modh/cuda-notebooks@sha256:2163ba74f602ec4b3049a88dcfa4fe0a8d0fff231090001947da66ef8e75ab9a +odh-trustyai-notebook-image-n=quay.io/modh/odh-trustyai-notebook@sha256:b68c1bfd9926b224180835382b36ad25e2269ffb95fca0646a89c8cceb6a6e7a +odh-trustyai-notebook-image-n-1=quay.io/modh/odh-trustyai-notebook@sha256:e56619204c60654f45bd4fedb98ae842b917b24a29cec4a51df87634211db198 odh-habana-notebook-image-n=quay.io/modh/odh-habana-notebooks@sha256:56041d1d4588105a3b21256cb9fc976d4673a2640b321674ba5379fbb6edea8b odh-habana-notebook-image-n-1=quay.io/modh/odh-habana-notebooks@sha256:25e43ae89f7f509170bf5a58ce98376e9ae9637d5054ae4e7dc83498f15dd874 diff --git a/jupyterhub/notebook-images/overlays/additional/params.yaml b/jupyterhub/notebook-images/overlays/additional/params.yaml index f1001a329..76f944857 100644 --- a/jupyterhub/notebook-images/overlays/additional/params.yaml +++ b/jupyterhub/notebook-images/overlays/additional/params.yaml @@ -1,53 +1,78 @@ +--- varReference: -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-minimal-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-minimal-notebook-image-n-1 -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-minimal-gpu-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-minimal-gpu-notebook-image-n-1 -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-pytorch-gpu-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-pytorch-gpu-notebook-image-n-1 -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-generic-data-science-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-generic-data-science-notebook-image-n-1 -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-tensorflow-gpu-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-tensorflow-gpu-notebook-image-n-1 -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-trustyai-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-habana-notebook-image-n -- path: spec/tags[]/from/name - kind: ImageStream - apiGroup: image.openshift.io/v1 - name: odh-habana-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-notebook-image-n-2 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-gpu-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-gpu-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-minimal-gpu-notebook-image-n-2 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-pytorch-gpu-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-pytorch-gpu-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-pytorch-gpu-notebook-image-n-2 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-generic-data-science-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-generic-data-science-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-generic-data-science-notebook-image-n-2 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-tensorflow-gpu-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-tensorflow-gpu-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-tensorflow-gpu-notebook-image-n-2 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-trustyai-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-trustyai-notebook-image-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-habana-notebook-image-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-habana-notebook-image-n-1 diff --git a/jupyterhub/notebook-images/overlays/additional/pytorch-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/pytorch-notebook-imagestream.yaml index 2ddaa71c8..a383f93a2 100644 --- a/jupyterhub/notebook-images/overlays/additional/pytorch-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/pytorch-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -14,26 +15,37 @@ spec: lookupPolicy: local: true tags: - # N Version of the image (v2-2023a-20230526-c4c062e) - - annotations: - opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra,"version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook - opendatahub.io/workbench-image-recommended: 'true' - from: - kind: DockerImage - name: $(odh-pytorch-gpu-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source - # N-1 Version of the image - - annotations: + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"2.0"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"2.0"},{"name":"Tensorboard","version":"2.13"}, {"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]' + openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook + opendatahub.io/workbench-image-recommended: 'true' + from: + kind: DockerImage + name: $(odh-pytorch-gpu-notebook-image-n) + name: "2023.2" + referencePolicy: + type: Source + # N-1 Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"PyTorch","version":"1.13"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.13"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/odh-pytorch-notebook + from: + kind: DockerImage + name: $(odh-pytorch-gpu-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source + # N-2 Version of the image + - annotations: opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"PyTorch","version":"1.8"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"PyTorch","version":"1.8"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]' openshift.io/imported-from: quay.io/modh/cuda-notebooks - from: - kind: DockerImage - name: $(odh-pytorch-gpu-notebook-image-n-1) - name: "1.2" - referencePolicy: - type: Source + from: + kind: DockerImage + name: $(odh-pytorch-gpu-notebook-image-n-2) + name: "1.2" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml index 3f0266cd0..324092149 100644 --- a/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/tensorflow-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -14,26 +15,37 @@ spec: lookupPolicy: local: true tags: - # N Version of the image (2023a-20230526-c4c062e) - - annotations: - opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.11"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.11"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra,"version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/cuda-notebooks - opendatahub.io/workbench-image-recommended: 'true' - from: - kind: DockerImage - name: $(odh-tensorflow-gpu-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source - # N-1 Version of the image - - annotations: + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.13"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.13"},{"name":"Tensorboard","version":"2.13"}, {"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]' + openshift.io/imported-from: quay.io/modh/cuda-notebooks + opendatahub.io/workbench-image-recommended: 'true' + from: + kind: DockerImage + name: $(odh-tensorflow-gpu-notebook-image-n) + name: "2023.2" + referencePolicy: + type: Source + # N-1 Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"},{"name":"TensorFlow","version":"2.11"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.11"},{"name":"Tensorboard","version":"2.11"},{"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/cuda-notebooks + from: + kind: DockerImage + name: $(odh-tensorflow-gpu-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source + # N-2 Version of the image + - annotations: opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.4"},{"name":"Python","version":"v3.8"},{"name":"TensorFlow","version":"2.7"}]' opendatahub.io/notebook-python-dependencies: '[{"name":"TensorFlow","version":"2.7"},{"name":"Tensorboard","version":"2.6"},{"name":"Boto3","version":"1.17"},{"name":"Kafka-Python","version":"2.0"},{"name":"Matplotlib","version":"3.4"},{"name":"Numpy","version":"1.19"},{"name":"Pandas","version":"1.2"},{"name":"Scikit-learn","version":"0.24"},{"name":"Scipy","version":"1.6"}]' openshift.io/imported-from: quay.io/modh/cuda-notebooks - from: - kind: DockerImage - name: $(odh-tensorflow-gpu-notebook-image-n-1) - name: "1.2" - referencePolicy: - type: Source + from: + kind: DockerImage + name: $(odh-tensorflow-gpu-notebook-image-n-2) + name: "1.2" + referencePolicy: + type: Source diff --git a/jupyterhub/notebook-images/overlays/additional/trustyai-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/trustyai-notebook-imagestream.yaml index 2e459eb61..9705559ee 100644 --- a/jupyterhub/notebook-images/overlays/additional/trustyai-notebook-imagestream.yaml +++ b/jupyterhub/notebook-images/overlays/additional/trustyai-notebook-imagestream.yaml @@ -1,3 +1,4 @@ +--- apiVersion: image.openshift.io/v1 kind: ImageStream metadata: @@ -13,14 +14,26 @@ spec: lookupPolicy: local: true tags: - # N version of the image (v1-2023a-20230526-c4c062e) - - annotations: - opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' - opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.2"}, {"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra,"version":"3.15"}]' - openshift.io/imported-from: quay.io/modh/odh-trustyai-notebook - from: - kind: DockerImage - name: $(odh-trustyai-notebook-image-n) - name: "2023.1" - referencePolicy: - type: Source + # N Version of the image + - annotations: + opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]' + opendatahub.io/notebook-python-dependencies: '[{"name":"TrustyAI","version":"0.3"}, {"name":"Boto3","version":"1.28"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"name":"Matplotlib","version":"3.6"},{"name":"Numpy","version":"1.24"},{"name":"Pandas","version":"1.5"},{"name":"Scikit-learn","version":"1.3"},{"name":"Scipy","version":"1.11"},{"name":"Elyra","version":"3.15"},{"name":"PyMongo","version":"4.5"},{"name":"Pyodbc","version":"4.0"}, {"name":"Codeflare-SDK","version":"0.10"}, {"name":"Sklearn-onnx","version":"1.15"}, {"name":"Psycopg","version":"3.1"}, {"name":"MySQL Connector/Python","version":"8.0"}]' + openshift.io/imported-from: quay.io/modh/odh-trustyai-notebook + opendatahub.io/workbench-image-recommended: 'true' + from: + kind: DockerImage + name: $(odh-trustyai-notebook-image-n) + name: "2023.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":"TrustyAI","version":"0.2"}, {"name":"Boto3","version":"1.26"},{"name":"Kafka-Python","version":"2.0"},{"name":"Kfp-tekton","version":"1.5"},{"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.10"},{"name":"Elyra","version":"3.15"}]' + openshift.io/imported-from: quay.io/modh/odh-trustyai-notebook + from: + kind: DockerImage + name: $(odh-trustyai-notebook-image-n-1) + name: "2023.1" + referencePolicy: + type: Source