From b06b61b3ce0567c5e497320d21ff2e7f1aa1b1fd Mon Sep 17 00:00:00 2001
From: atheo89 <atheodorak@outlook.com>
Date: Tue, 13 Jun 2023 11:36:07 +0200
Subject: [PATCH] Introduce imagestreams that inlude vs-code and r studio
 workbenches into OOTB

---
 .../code-server-notebook-imagestream.yaml     | 25 +++++++++++++++++++
 notebook-images/base/kustomization.yaml       | 24 ++++++++++++++++++
 notebook-images/base/params.env               |  3 +++
 notebook-images/base/params.yaml              | 13 +++++++++-
 .../rstudio-gpu-notebook-imagestream.yaml     | 25 +++++++++++++++++++
 .../base/rstudio-notebook-imagestream.yaml    | 25 +++++++++++++++++++
 6 files changed, 114 insertions(+), 1 deletion(-)
 create mode 100644 notebook-images/base/code-server-notebook-imagestream.yaml
 create mode 100644 notebook-images/base/rstudio-gpu-notebook-imagestream.yaml
 create mode 100644 notebook-images/base/rstudio-notebook-imagestream.yaml

diff --git a/notebook-images/base/code-server-notebook-imagestream.yaml b/notebook-images/base/code-server-notebook-imagestream.yaml
new file mode 100644
index 000000000..c83bd5c08
--- /dev/null
+++ b/notebook-images/base/code-server-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/codeserver"
+    opendatahub.io/notebook-image-name: "Code Server"
+    opendatahub.io/notebook-image-desc: "Code Server workbench image that allows to run Visual Studio Code (VSCode) on a remote server through the browser"
+    opendatahub.io/notebook-image-order: "7"
+  name: code-server-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"code-sever","version":"4.11"}]'
+      openshift.io/imported-from: quay.io/opendatahub/workbench-images
+    from:
+      kind: DockerImage
+      name: $(odh-code-server-notebook-image)
+    name: "2023.1"
+    referencePolicy:
+      type: Source
diff --git a/notebook-images/base/kustomization.yaml b/notebook-images/base/kustomization.yaml
index c71156ca7..c4dd5f1e0 100644
--- a/notebook-images/base/kustomization.yaml
+++ b/notebook-images/base/kustomization.yaml
@@ -7,6 +7,9 @@ resources:
 - jupyter-pytorch-notebook-imagestream.yaml
 - jupyter-tensorflow-notebook-imagestream.yaml
 - jupyter-trustyai-notebook-imagestream.yaml
+- code-server-notebook-imagestream.yaml
+- rstudio-notebook-imagestream.yaml
+- rstudio-gpu-notebook-imagestream.yaml
 commonLabels:
   opendatahub.io/component: "true"
   component.opendatahub.io/name: notebooks
@@ -94,6 +97,27 @@ vars:
       apiVersion: v1
     fieldref:
       fieldpath: data.odh-trustyai-notebook-image-n
+  - name: odh-code-server-notebook-image
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-code-server-notebook-image
+  - name: odh-rstudio-notebook-image
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rstudio-notebook-image
+  - name: odh-rstudio-gpu-notebook-image
+    objref:
+      kind: ConfigMap
+      name: notebooks-parameters
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.odh-rstudio-gpu-notebook-image
 configurations:
   - params.yaml
 
diff --git a/notebook-images/base/params.env b/notebook-images/base/params.env
index 51a73275a..ba4fc7f97 100644
--- a/notebook-images/base/params.env
+++ b/notebook-images/base/params.env
@@ -9,3 +9,6 @@ odh-generic-data-science-notebook-image-n-1=quay.io/opendatahub/notebooks@sha256
 odh-tensorflow-gpu-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:a10b672ac314b4ab00afca32ff373909d1989d96442c97749cd48a17c55a13e7
 odh-tensorflow-gpu-notebook-image-n-1=quay.io/opendatahub/notebooks@sha256:fc52e4fbc8c1c70dfa22dbfe6b0353f5165c507c125df4438fca6a3f31fe976e
 odh-trustyai-notebook-image-n=quay.io/opendatahub/workbench-images@sha256:efc708b7d0decab7933a693617720d171b6b774cb0a9455b027a7df51d1e5640
+odh-code-server-notebook-image=quay.io/opendatahub/workbench-images@sha256:fd5b9f65c0f46d4c093e2f58fce305eeb125bf19ee1d88f67b9fafe56142e92d
+odh-rstudio-notebook-image=quay.io/opendatahub/workbench-images@sha256:75d6764e1155c1d18dc4472ff319f9291d0d9703b19ee1374e902b6ab7f55cfb
+odh-rstudio-gpu-notebook-image=quay.io/opendatahub/workbench-images@sha256:aef5fd12264651abf286e9a4efbe25ca002cc257fbc6f1a5daf39fd55c7d6206
diff --git a/notebook-images/base/params.yaml b/notebook-images/base/params.yaml
index 132c15ad5..578714b70 100644
--- a/notebook-images/base/params.yaml
+++ b/notebook-images/base/params.yaml
@@ -43,4 +43,15 @@ varReference:
   kind: ImageStream
   apiGroup: image.openshift.io/v1
   name: odh-trustyai-notebook-image-n
-  
\ No newline at end of file
+- path: spec/tags[]/from/name
+  kind: ImageStream
+  apiGroup: image.openshift.io/v1
+  name: odh-code-server-notebook-image
+- path: spec/tags[]/from/name
+  kind: ImageStream
+  apiGroup: image.openshift.io/v1
+  name: odh-rstudio-notebook-image
+- path: spec/tags[]/from/name
+  kind: ImageStream
+  apiGroup: image.openshift.io/v1
+  name: odh-rstudio-gpu-notebook-image
diff --git a/notebook-images/base/rstudio-gpu-notebook-imagestream.yaml b/notebook-images/base/rstudio-gpu-notebook-imagestream.yaml
new file mode 100644
index 000000000..0ef3c6e08
--- /dev/null
+++ b/notebook-images/base/rstudio-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/rstudio"
+    opendatahub.io/notebook-image-name: "CUDA - R Studio"
+    opendatahub.io/notebook-image-desc: "R Studio workbench image that allows to integrated development environment for R, a programming language for statistical computing and graphics."
+    opendatahub.io/notebook-image-order: "9"
+  name: rstudio-gpu-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+      opendatahub.io/notebook-software: '[{"name":"CUDA","version":"11.8"},{"name":"Python","version":"v3.9"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
+      openshift.io/imported-from: quay.io/opendatahub/workbench-images
+    from:
+      kind: DockerImage
+      name: $(odh-rstudio-gpu-notebook-image)
+    name: "2023.1"
+    referencePolicy:
+      type: Source
diff --git a/notebook-images/base/rstudio-notebook-imagestream.yaml b/notebook-images/base/rstudio-notebook-imagestream.yaml
new file mode 100644
index 000000000..05bc39027
--- /dev/null
+++ b/notebook-images/base/rstudio-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/rstudio"
+    opendatahub.io/notebook-image-name: "R Studio"
+    opendatahub.io/notebook-image-desc: "R Studio workbench image that allows to integrated development environment for R, a programming language for statistical computing and graphics."
+    opendatahub.io/notebook-image-order: "8"
+  name: rstudio-notebook
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.9"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"r-studio","version":"4.3"}]'
+      openshift.io/imported-from: quay.io/opendatahub/workbench-images
+    from:
+      kind: DockerImage
+      name: $(odh-rstudio-notebook-image)
+    name: "2023.1"
+    referencePolicy:
+      type: Source