From ef91138ca326deeaf7370a28bccdb4a0282e84d6 Mon Sep 17 00:00:00 2001 From: atheo89 Date: Tue, 31 Oct 2023 13:28:49 +0100 Subject: [PATCH] Move vscode and r-studio to the base layer --- .../code-server-notebook-imagestream.yaml | 4 +- manifests/base/kustomization.yaml | 45 +++++++++++++++++++ manifests/base/params.env | 6 +++ manifests/base/params.yaml | 24 ++++++++++ .../rstudio-gpu-notebook-imagestream.yaml | 4 +- .../rstudio-notebook-imagestream.yaml | 4 +- manifests/overlays/additional/README.md | 11 ----- .../overlays/additional/kustomization.yaml | 13 ------ 8 files changed, 81 insertions(+), 30 deletions(-) rename manifests/{overlays/additional => base}/code-server-notebook-imagestream.yaml (85%) rename manifests/{overlays/additional => base}/rstudio-gpu-notebook-imagestream.yaml (86%) rename manifests/{overlays/additional => base}/rstudio-notebook-imagestream.yaml (85%) delete mode 100644 manifests/overlays/additional/README.md delete mode 100644 manifests/overlays/additional/kustomization.yaml diff --git a/manifests/overlays/additional/code-server-notebook-imagestream.yaml b/manifests/base/code-server-notebook-imagestream.yaml similarity index 85% rename from manifests/overlays/additional/code-server-notebook-imagestream.yaml rename to manifests/base/code-server-notebook-imagestream.yaml index d9adb0dfe..c79158f28 100644 --- a/manifests/overlays/additional/code-server-notebook-imagestream.yaml +++ b/manifests/base/code-server-notebook-imagestream.yaml @@ -22,7 +22,7 @@ spec: opendatahub.io/workbench-image-recommended: 'true' from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3 + name: $(odh-codeserver-notebook-n) name: "2023.2" referencePolicy: type: Source @@ -33,7 +33,7 @@ spec: openshift.io/imported-from: quay.io/opendatahub/workbench-images from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d + name: $(odh-codeserver-notebook-n-1) name: "2023.1" referencePolicy: type: Source diff --git a/manifests/base/kustomization.yaml b/manifests/base/kustomization.yaml index 0dee96ce4..5219d14fb 100644 --- a/manifests/base/kustomization.yaml +++ b/manifests/base/kustomization.yaml @@ -9,6 +9,9 @@ resources: - jupyter-tensorflow-notebook-imagestream.yaml - jupyter-trustyai-notebook-imagestream.yaml - jupyter-habana-notebook-imagestream.yaml + - code-server-notebook-imagestream.yaml + - rstudio-gpu-notebook-imagestream.yaml + - rstudio-notebook-imagestream.yaml commonLabels: opendatahub.io/component: "true" @@ -146,5 +149,47 @@ vars: apiVersion: v1 fieldref: fieldpath: data.odh-habana-notebook-image-n + - name: odh-codeserver-notebook-n + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-codeserver-notebook-n + - name: odh-codeserver-notebook-n-1 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-codeserver-notebook-n-1 + - name: odh-rstudio-notebook-n + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-rstudio-notebook-n + - name: odh-rstudio-notebook-n-1 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: data.odh-rstudio-notebook-n-1 + - name: odh-rstudio-gpu-notebook-n + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: odh-rstudio-gpu-notebook-n + - name: odh-rstudio-gpu-notebook-n-1 + objref: + kind: ConfigMap + name: notebooks-parameters + apiVersion: v1 + fieldref: + fieldpath: odh-rstudio-gpu-notebook-n-1 configurations: - params.yaml diff --git a/manifests/base/params.env b/manifests/base/params.env index d62f50d40..3d001313c 100644 --- a/manifests/base/params.env +++ b/manifests/base/params.env @@ -16,3 +16,9 @@ odh-tensorflow-gpu-notebook-image-n-2=quay.io/opendatahub/notebooks@sha256:fc52e odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:636fdf26877be4013bc516c5ef4a818b5f7f29119ec3f601005fefc6d49433f0 odh-trustyai-notebook-image-n-1=quay.io/opendatahub/workbench-images@sha256:9c7dfc1c58bcbafbb4ffae58641e1bc4c3b5850886960bf27c652b7d0635d779 odh-habana-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:b0821ae2abe45387a371108ac08e7474b64255e5c4519de5da594b4617fd79fe +odh-codeserver-notebook-n=quay.io/opendatahub/workbench-images@sha256:1c5bcbfc222dfb59849fee67e050719c688c93d3608f7b46edbe5666263641f3 +odh-codeserver-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d +odh-rstudio-notebook-n=quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608 +odh-rstudio-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb +odh-rstudio-gpu-notebook-n=quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd +odh-rstudio-gpu-notebook-n-1=quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206 diff --git a/manifests/base/params.yaml b/manifests/base/params.yaml index 4319f6edc..c8bd43c5a 100644 --- a/manifests/base/params.yaml +++ b/manifests/base/params.yaml @@ -72,3 +72,27 @@ varReference: 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-codeserver-notebook-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-codeserver-notebook-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rstudio-notebook-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rstudio-notebook-n-1 + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rstudio-gpu-notebook-n + - path: spec/tags[]/from/name + kind: ImageStream + apiGroup: image.openshift.io/v1 + name: odh-rstudio-gpu-notebook-n-1 diff --git a/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml b/manifests/base/rstudio-gpu-notebook-imagestream.yaml similarity index 86% rename from manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml rename to manifests/base/rstudio-gpu-notebook-imagestream.yaml index 9bc256670..6f924a5ee 100644 --- a/manifests/overlays/additional/rstudio-gpu-notebook-imagestream.yaml +++ b/manifests/base/rstudio-gpu-notebook-imagestream.yaml @@ -23,7 +23,7 @@ spec: opendatahub.io/workbench-image-recommended: 'true' from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:3ad0bb5f3b8c2ca1d29a423913b6d8f32353d9787c5f38e4b56a9a922f6e3cdd + name: $(odh-rstudio-gpu-notebook-n) name: "2023.2" referencePolicy: type: Source @@ -34,7 +34,7 @@ spec: openshift.io/imported-from: quay.io/opendatahub/workbench-images from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206 + name: $(odh-rstudio-gpu-notebook-n-1) name: "2023.1" referencePolicy: type: Source diff --git a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml b/manifests/base/rstudio-notebook-imagestream.yaml similarity index 85% rename from manifests/overlays/additional/rstudio-notebook-imagestream.yaml rename to manifests/base/rstudio-notebook-imagestream.yaml index 89cf87779..8f711cb17 100644 --- a/manifests/overlays/additional/rstudio-notebook-imagestream.yaml +++ b/manifests/base/rstudio-notebook-imagestream.yaml @@ -22,7 +22,7 @@ spec: opendatahub.io/workbench-image-recommended: 'true' from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:8e99e4e3800db121d02b50adec5eba27746bf89d32dba3e2b17e8d750ac53608 + name: $(odh-rstudio-notebook-n) name: "2023.2" referencePolicy: type: Source @@ -33,7 +33,7 @@ spec: openshift.io/imported-from: quay.io/opendatahub/workbench-images from: kind: DockerImage - name: quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb + name: $(odh-rstudio-notebook-n-1) name: "2023.1" referencePolicy: type: Source diff --git a/manifests/overlays/additional/README.md b/manifests/overlays/additional/README.md deleted file mode 100644 index 7b03fab93..000000000 --- a/manifests/overlays/additional/README.md +++ /dev/null @@ -1,11 +0,0 @@ -Open Data Hub Tier 1 Notebooks -=== - -All of the notebooks in this repo are supported by the ODH Community as a Tier 1 component but not part of the ODH Core deployment. -The source build files for any notebook in this repo must exist under the [opendatahub-io](https://github.com/opendatahub-io) organization - -Notebooks: -=== -* [Code Server Notebook ](https://github.com/opendatahub-io/notebooks/tree/main/codeserver) - Notebook image, allows to run Visual Studio Code (VSCode) -* [R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R -* [CUDA R Studio Notebook](https://github.com/opendatahub-io/notebooks/tree/main/rstudio) - Notebook image, integrated development environment (IDE) for R with embedded CUDA capabilities diff --git a/manifests/overlays/additional/kustomization.yaml b/manifests/overlays/additional/kustomization.yaml deleted file mode 100644 index 643d11e51..000000000 --- a/manifests/overlays/additional/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - code-server-notebook-imagestream.yaml - - rstudio-notebook-imagestream.yaml - - rstudio-gpu-notebook-imagestream.yaml - -commonLabels: - opendatahub.io/component: "true" - component.opendatahub.io/name: notebooks