Integrate the new prebuild image notebooks into upstream

opendatahub-io · Nov 29, 2022 · 6827ea9 · 6827ea9
1 parent 73941cc
commit 6827ea9
Show file tree

Hide file tree

Showing 12 changed files with 243 additions and 19 deletions.
diff --git a/notebook-images/base/jupyter-datascience-notebook-imagestream.yaml b/notebook-images/base/jupyter-datascience-notebook-imagestream.yaml
@@ -0,0 +1,25 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/jupyter/datascience/ubi8-python-3.8"
+    opendatahub.io/notebook-image-name: "Jupyter Data Science"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with a set of data science libraries that advanced AI/ML notebooks will use as a base image to provide a standard for libraries avialable in all notebooks"
+    opendatahub.io/notebook-image-order: "2"
+  name: jupyter-datascience-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - 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/opendatahub/notebooks
+    from:
+      kind: DockerImage
+      name: quay.io/opendatahub/notebooks@sha256:5df71f5542d2e0161f0f4342aa9a390679d72dc6fae192fd8da1e5671b27e8d4
+    name: "py3.8-v1"
+    referencePolicy:
+      type: Source
diff --git a/notebook-images/base/jupyter-minimal-gpu-notebook-imagestream.yaml b/notebook-images/base/jupyter-minimal-gpu-notebook-imagestream.yaml
@@ -0,0 +1,25 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/tree/main/jupyter/minimal/ubi8-python-3.8"
+    opendatahub.io/notebook-image-name: "CUDA"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with GPU support and minimal dependency set to start experimenting with Jupyter environment."
+    opendatahub.io/notebook-image-order: "3"
+  name: jupyter-minimal-gpu-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+        opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8"}]'
+        opendatahub.io/notebook-python-dependencies: '[{"name":"JupyterLab","version":"3.2.4"},{"name":"Notebook","version":"6.4"}]'
+        openshift.io/imported-from: quay.io/opendatahub/notebooks
+    from:
+      kind: DockerImage
+      name: quay.io/opendatahub/notebooks@sha256:c13cd3410e31184986d44d36ba663ca2f2225d14e5b086b09fe221219a94b6de
+    name: "py3.8-v1"
+    referencePolicy:
+      type: Local
diff --git a/notebook-images/base/jupyter-minimal-notebook-imagestream.yaml b/notebook-images/base/jupyter-minimal-notebook-imagestream.yaml
@@ -0,0 +1,26 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com//opendatahub-io/notebooks/tree/main/jupyter/minimal/ubi8-python-3.8"
+    opendatahub.io/notebook-image-name: "Minimal Python"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with minimal dependency set to start experimenting with Jupyter environment."
+    opendatahub.io/notebook-image-order: "1"
+  name: jupyter-minimal-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - 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/opendatahub/notebooks
+      opendatahub.io/default-image: "true"
+    from:
+      kind: DockerImage
+      name: quay.io/opendatahub/notebooks@sha256:a138838e1c9acd7708462e420bf939e03296b97e9cf6c0aa0fd9a5d20361ab75
+    name: "py3.8-v1"
+    referencePolicy:
+      type: Local
diff --git a/notebook-images/base/jupyter-pytorch-notebook-imagestream.yaml b/notebook-images/base/jupyter-pytorch-notebook-imagestream.yaml
@@ -0,0 +1,25 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/pytorch/ubi8-python-3.8"
+    opendatahub.io/notebook-image-name: "PyTorch"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with PyTorch libraries and dependencies to start experimenting with advanced AI/ML notebooks."
+    opendatahub.io/notebook-image-order: "4"
+  name: jupyter-pytorch-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+        opendatahub.io/notebook-software: '[{"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/opendatahub/notebooks
+    from:
+      kind: DockerImage
+      name: quay.io/opendatahub/notebooks@sha256:94c5d01b19a0f30c0ca18153c50f18317f42c224e82321ef39c43116e7184731
+    name: "py3.8-v1"
+    referencePolicy:
+      type: Local
diff --git a/notebook-images/base/jupyter-tensorflow-notebook-imagestream.yaml b/notebook-images/base/jupyter-tensorflow-notebook-imagestream.yaml
@@ -0,0 +1,25 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  labels:
+    opendatahub.io/notebook-image: "true"
+  annotations:
+    opendatahub.io/notebook-image-url: "https://github.com/opendatahub-io/notebooks/blob/main/jupyter/tensorflow/ubi8-python-3.8"
+    opendatahub.io/notebook-image-name: "TensorFlow"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with TensorFlow libraries and dependencies to start experimenting with advanced AI/ML notebooks."
+    opendatahub.io/notebook-image-order: "5"
+  name: jupyter-tensorflow-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+        opendatahub.io/notebook-software: '[{"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/opendatahub/notebooks
+    from:
+      kind: DockerImage
+      name: quay.io/opendatahub/notebooks@sha256:fc52e4fbc8c1c70dfa22dbfe6b0353f5165c507c125df4438fca6a3f31fe976e
+    name: "py3.8-v1"
+    referencePolicy:
+      type: Local
diff --git a/notebook-images/base/kustomization.yaml b/notebook-images/base/kustomization.yaml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- jupyter-minimal-notebook-imagestream.yaml
+- jupyter-datascience-notebook-imagestream.yaml
+- jupyter-minimal-gpu-notebook-imagestream.yaml
+- jupyter-pytorch-notebook-imagestream.yaml
+- jupyter-tensorflow-notebook-imagestream.yaml
+commonLabels:
+  opendatahub.io/component: "true"
+  component.opendatahub.io/name: notebooks
+
+
diff --git a/tests/resources/notebook-controller/notebooks/cuda-jupyter-minimal-ubi8-python-3-8.yaml b/tests/resources/notebook-controller/notebooks/cuda-jupyter-minimal-ubi8-python-3-8.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: kubeflow.org/v1
+kind: Notebook
+metadata:
+  name: cuda-jupyter-minimal-ubi8-python-3-8
+  annotations:
+    notebooks.opendatahub.io/inject-oauth: "true"
+spec:
+  template:
+    spec:
+      containers:
+        - name: cuda-jupyter-minimal-ubi8-python-3-8
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-minimal-gpu-notebook:py3.8-v1
+          imagePullPolicy: Always
+          workingDir: /opt/app-root/src
+          env:
+            - name: NOTEBOOK_ARGS
+              value: |
+                --ServerApp.port=8888
+                --ServerApp.token=''
+                --ServerApp.password=''
+                --ServerApp.base_url=/notebook/opendatahub/cuda-jupyter-minimal-ubi8-python-3-8
+          ports:
+            - name: notebook-port
+              containerPort: 8888
+              protocol: TCP
+          resources:
+            requests:
+              cpu: "1"
+              memory: 1Gi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+          livenessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 1
+            successThreshold: 1
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTP
+              path: /notebook/opendatahub/cuda-jupyter-minimal-ubi8-python-3-8/api
+              port: notebook-port
diff --git a/...tebooks/thoth-minimal-oauth-notebook.yaml → ...cuda-jupyter-pytorch-ubi8-python-3-8.yaml b/...tebooks/thoth-minimal-oauth-notebook.yaml → ...cuda-jupyter-pytorch-ubi8-python-3-8.yaml
@@ -2,15 +2,15 @@
 apiVersion: kubeflow.org/v1
 kind: Notebook
 metadata:
-  name: thoth-minimal-oauth-notebook
+  name: cuda-jupyter-pytorch-ubi8-python-3-8
   annotations:
     notebooks.opendatahub.io/inject-oauth: "true"
 spec:
   template:
     spec:
       containers:
-        - name: thoth-minimal-oauth-notebook
-          image: image-registry.openshift-image-registry.svc:5000/opendatahub/s2i-minimal-notebook:v0.3.0-py38
+        - name: cuda-jupyter-pytorch-ubi8-python-3-8
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-pytorch-notebook:py3.8-v1
           imagePullPolicy: Always
           workingDir: /opt/app-root/src
           env:
@@ -19,7 +19,7 @@ spec:
                 --ServerApp.port=8888
                 --ServerApp.token=''
                 --ServerApp.password=''
-                --ServerApp.base_url=/notebook/opendatahub/thoth-minimal-oauth-notebook
+                --ServerApp.base_url=/notebook/opendatahub/cuda-jupyter-pytorch-ubi8-python-3-8
           ports:
             - name: notebook-port
               containerPort: 8888
@@ -39,5 +39,5 @@ spec:
             failureThreshold: 3
             httpGet:
               scheme: HTTP
-              path: /notebook/opendatahub/thoth-minimal-oauth-notebook/api
+              path: /notebook/opendatahub/cuda-jupyter-pytorch-ubi8-python-3-8/api
               port: notebook-port
diff --git a/tests/resources/notebook-controller/notebooks/cuda-jupyter-tensorflow-ubi8-python-3-8.yaml b/tests/resources/notebook-controller/notebooks/cuda-jupyter-tensorflow-ubi8-python-3-8.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: kubeflow.org/v1
+kind: Notebook
+metadata:
+  name: cuda-jupyter-tensorflow-ubi8-python-3-8
+  annotations:
+    notebooks.opendatahub.io/inject-oauth: "true"
+spec:
+  template:
+    spec:
+      containers:
+        - name: cuda-jupyter-tensorflow-ubi8-python-3-8
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-tensorflow-notebook:py3.8-v1
+          imagePullPolicy: Always
+          workingDir: /opt/app-root/src
+          env:
+            - name: NOTEBOOK_ARGS
+              value: |
+                --ServerApp.port=8888
+                --ServerApp.token=''
+                --ServerApp.password=''
+                --ServerApp.base_url=/notebook/opendatahub/cuda-jupyter-tensorflow-ubi8-python-3-8
+          ports:
+            - name: notebook-port
+              containerPort: 8888
+              protocol: TCP
+          resources:
+            requests:
+              cpu: "1"
+              memory: 1Gi
+            limits:
+              cpu: "1"
+              memory: 1Gi
+          livenessProbe:
+            initialDelaySeconds: 10
+            periodSeconds: 5
+            timeoutSeconds: 1
+            successThreshold: 1
+            failureThreshold: 3
+            httpGet:
+              scheme: HTTP
+              path: /notebook/opendatahub/cuda-jupyter-tensorflow-ubi8-python-3-8/api
+              port: notebook-port
diff --git a/...ler/notebooks/thoth-minimal-notebook.yaml → .../jupyter-datascience-ubi8-python-3-8.yaml b/...ler/notebooks/thoth-minimal-notebook.yaml → .../jupyter-datascience-ubi8-python-3-8.yaml
@@ -2,13 +2,15 @@
 apiVersion: kubeflow.org/v1
 kind: Notebook
 metadata:
-  name: thoth-minimal-notebook
+  name: jupyter-datascience-ubi8-python-3-8
+  annotations:
+    notebooks.opendatahub.io/inject-oauth: "true"
 spec:
   template:
     spec:
       containers:
-        - name: thoth-minimal-notebook
-          image: image-registry.openshift-image-registry.svc:5000/opendatahub/s2i-minimal-notebook:v0.3.0-py38
+        - name: jupyter-datascience-ubi8-python-3-8
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-datascience-notebook:py3.8-v1
           imagePullPolicy: Always
           workingDir: /opt/app-root/src
           env:
@@ -17,7 +19,7 @@ spec:
                 --ServerApp.port=8888
                 --ServerApp.token=''
                 --ServerApp.password=''
-                --ServerApp.base_url=/notebook/opendatahub/thoth-minimal-notebook
+                --ServerApp.base_url=/notebook/opendatahub/jupyter-datascience-ubi8-python-3-8
           ports:
             - name: notebook-port
               containerPort: 8888
@@ -37,5 +39,5 @@ spec:
             failureThreshold: 3
             httpGet:
               scheme: HTTP
-              path: /notebook/opendatahub/thoth-minimal-notebook/api
+              path: /notebook/opendatahub/jupyter-datascience-ubi8-python-3-8/api
               port: notebook-port
diff --git a/...tebooks/thoth-generic-oauth-notebook.yaml → ...ooks/jupyter-minimal-ubi8-python-3-8.yaml b/...tebooks/thoth-generic-oauth-notebook.yaml → ...ooks/jupyter-minimal-ubi8-python-3-8.yaml
@@ -2,15 +2,15 @@
 apiVersion: kubeflow.org/v1
 kind: Notebook
 metadata:
-  name: thoth-generic-oauth-notebook
+  name: jupyter-minimal-ubi8-python-3-8
   annotations:
     notebooks.opendatahub.io/inject-oauth: "true"
 spec:
   template:
     spec:
       containers:
-        - name: thoth-generic-oauth-notebook
-          image: image-registry.openshift-image-registry.svc:5000/opendatahub/s2i-generic-data-science-notebook:v0.0.5
+        - name: jupyter-minimal-ubi8-python-3-8
+          image: image-registry.openshift-image-registry.svc:5000/opendatahub/jupyter-minimal-notebook:py3.8-v1
           imagePullPolicy: Always
           workingDir: /opt/app-root/src
           env:
@@ -19,7 +19,7 @@ spec:
                 --ServerApp.port=8888
                 --ServerApp.token=''
                 --ServerApp.password=''
-                --ServerApp.base_url=/notebook/opendatahub/thoth-generic-oauth-notebook
+                --ServerApp.base_url=/notebook/opendatahub/jupyter-minimal-ubi8-python-3-8
           ports:
             - name: notebook-port
               containerPort: 8888
@@ -39,5 +39,5 @@ spec:
             failureThreshold: 3
             httpGet:
               scheme: HTTP
-              path: /notebook/opendatahub/thoth-generic-oauth-notebook/api
+              path: /notebook/opendatahub/jupyter-minimal-ubi8-python-3-8/api
               port: notebook-port
diff --git a/tests/setup/odh-core.yaml b/tests/setup/odh-core.yaml
@@ -51,12 +51,9 @@ spec:
         path: odh-notebook-controller
     name: odh-notebook-controller
   - kustomizeConfig:
-      overlays:
-      #- cuda-11.0.3
-      - additional
       repoRef:
         name: manifests
-        path: jupyterhub/notebook-images
+        path: notebook-images
     name: notebook-images
   - kustomizeConfig:
       overlays: