From ae798d9de5943679119f22cf8229ca089cc3bd61 Mon Sep 17 00:00:00 2001
From: Landon LaSmith <LLaSmith@redhat.com>
Date: Mon, 23 Jan 2023 16:05:05 -0500
Subject: [PATCH] Add "additional" notebook images overlay

Add Elyra notebook as part of the new additional notebooks

Signed-off-by: Landon LaSmith <LLaSmith@redhat.com>
---
 .../elyra-notebook-imagestream.yaml           |  8 +++----
 notebook-images/OWNERS                        |  7 ++++++
 notebook-images/overlays/additional/README.md |  9 +++++++
 .../elyra-notebook-imagestream.yaml           | 24 +++++++++++++++++++
 .../overlays/additional/kustomization.yaml    |  9 +++++++
 5 files changed, 53 insertions(+), 4 deletions(-)
 create mode 100644 notebook-images/OWNERS
 create mode 100644 notebook-images/overlays/additional/README.md
 create mode 100644 notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
 create mode 100644 notebook-images/overlays/additional/kustomization.yaml

diff --git a/jupyterhub/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml b/jupyterhub/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
index aa94e3fdb..d902419bd 100644
--- a/jupyterhub/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
+++ b/jupyterhub/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
@@ -13,12 +13,12 @@ spec:
     local: true
   tags:
   - annotations:
-      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8.6"}]'
-      opendatahub.io/notebook-python-dependencies: '[{"name":"elyra","version":"3.10.1"}]'
+      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8.12"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"elyra","version":"3.12.0"}]'
       openshift.io/imported-from: quay.io/thoth-station/s2i-lab-elyra
     from:
       kind: DockerImage
-      name: quay.io/thoth-station/s2i-lab-elyra:v0.1.5
-    name: "v0.1.5"
+      name: quay.io/thoth-station/s2i-lab-elyra:v0.2.1
+    name: "v0.2.1"
     referencePolicy:
       type: Source
diff --git a/notebook-images/OWNERS b/notebook-images/OWNERS
new file mode 100644
index 000000000..d24f476d2
--- /dev/null
+++ b/notebook-images/OWNERS
@@ -0,0 +1,7 @@
+# Fetched from https://github.com/opendatahub-io/notebooks root OWNERS
+reviewers:
+  - atheo89
+  - VaishnaviHire
+approvers:
+  - atheo89
+  - VaishnaviHire
diff --git a/notebook-images/overlays/additional/README.md b/notebook-images/overlays/additional/README.md
new file mode 100644
index 000000000..00d4b35a7
--- /dev/null
+++ b/notebook-images/overlays/additional/README.md
@@ -0,0 +1,9 @@
+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:
+===
+* [Elyra Notebook](https://github.com/opendatahub-io/s2i-lab-elyra) - Jupyter notebook image with Elyra-AI installed
diff --git a/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml b/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
new file mode 100644
index 000000000..20b1c48d4
--- /dev/null
+++ b/notebook-images/overlays/additional/elyra-notebook-imagestream.yaml
@@ -0,0 +1,24 @@
+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/s2i-lab-elyra"
+    opendatahub.io/notebook-image-name: "Elyra Notebook Image"
+    opendatahub.io/notebook-image-desc: "Jupyter notebook image with Elyra-AI installed"
+  name: s2i-lab-elyra
+spec:
+  lookupPolicy:
+    local: true
+  tags:
+  - annotations:
+      opendatahub.io/notebook-software: '[{"name":"Python","version":"v3.8.12"}]'
+      opendatahub.io/notebook-python-dependencies: '[{"name":"elyra","version":"3.12.0"}]'
+      openshift.io/imported-from: quay.io/thoth-station/s2i-lab-elyra
+    from:
+      kind: DockerImage
+      name: quay.io/thoth-station/s2i-lab-elyra:v0.2.1
+    name: "v0.2.1"
+    referencePolicy:
+      type: Source
diff --git a/notebook-images/overlays/additional/kustomization.yaml b/notebook-images/overlays/additional/kustomization.yaml
new file mode 100644
index 000000000..2c0827c62
--- /dev/null
+++ b/notebook-images/overlays/additional/kustomization.yaml
@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+bases:
+- ../base
+resources:
+- elyra-notebook-imagestream.yaml
+commonLabels:
+  opendatahub.io/component: "true"
+  component.opendatahub.io/name: notebooks