From b90cb8af46439f25a15306975fc99fd42a06f378 Mon Sep 17 00:00:00 2001
From: DavidSpek <vanderspek.david@gmail.com>
Date: Tue, 31 Aug 2021 22:46:22 +0200
Subject: [PATCH] Update notebook images

---
 .github/renovate.json5                        | 16 +++++++++++++
 .../jupyter-web-app/spawner_ui_config.yaml    | 23 +++++++++++--------
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/.github/renovate.json5 b/.github/renovate.json5
index fd5b68c0..5da7542d 100644
--- a/.github/renovate.json5
+++ b/.github/renovate.json5
@@ -43,6 +43,14 @@
       "groupName": "knative",
       "additionalBranchPrefix": ""
     },
+    {
+      "description": "Notebook Updates",
+      "matchPackagePatterns": ["^ghcr.io\/pluralsh\/kubeflow-notebooks.*"],
+      "groupName": "notebooks",
+      "automerge": true,
+      "requiredStatusChecks": null,
+      "additionalBranchPrefix": ""
+    },
     //{
     //  "matchDatasources": [
     //    "docker"
@@ -100,6 +108,14 @@
           "(tag:|value:) (?<currentValue>.*) # (?<depName>.*)"
         ],
       "datasourceTemplate": "docker"
+    },
+    // Update Jupyter Spawner Images
+    {
+      "fileMatch": ["(^|/)spawner_ui_config.yaml$"],
+      "matchStrings": [
+          "(value:|-) (?<depName>kubeflownotebooks\/[^\/]*?)\:(?<currentValue>.*)"
+        ],
+      "datasourceTemplate": "docker"
     }
   ]
 }
diff --git a/distribution/kubeflow/notebooks/jupyter-web-app/spawner_ui_config.yaml b/distribution/kubeflow/notebooks/jupyter-web-app/spawner_ui_config.yaml
index 09c18748..676d935b 100644
--- a/distribution/kubeflow/notebooks/jupyter-web-app/spawner_ui_config.yaml
+++ b/distribution/kubeflow/notebooks/jupyter-web-app/spawner_ui_config.yaml
@@ -21,25 +21,28 @@ data:
     # Note that some values can be templated. Such values are the names of the
     # Volumes as well as their StorageClass
     spawnerFormDefaults:
+    # container image source available at https://github.com/pluralsh/kubeflow-notebooks
       image:
         # The container Image for the user's Jupyter Notebook
-        value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:master-1831e436
+        value: ghcr.io/pluralsh/kubeflow-notebooks-jupyter-scipy:v1.0.0
         # The list of available standard container Images
         options:
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-scipy:master-1831e436
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-full:master-1831e436
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-pytorch-cuda-full:master-1831e436
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-full:master-1831e436
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/jupyter-tensorflow-cuda-full:master-1831e436
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-scipy:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-pytorch-full:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-pytorch-full-cuda:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-tensorflow-full:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-tensorflow-full-cuda:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-go:v1.0.0
+          - ghcr.io/pluralsh/kubeflow-notebooks-jupyter-elixir:v1.0.0
       imageGroupOne:
         # The container Image for the user's Group One Server
         # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
         # is applied to notebook in this group, configuring
         # the Istio rewrite for containers that host their web UI at `/`
-        value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:master-1831e436
+        value: ghcr.io/pluralsh/kubeflow-notebooks-codeserver-python:v1.0.0
         # The list of available standard container Images
         options:
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/codeserver-python:master-1831e436
+          - ghcr.io/pluralsh/kubeflow-notebooks-codeserver-python:v1.0.0
       imageGroupTwo:
         # The container Image for the user's Group Two Server
         # The annotation `notebooks.kubeflow.org/http-rewrite-uri: /`
@@ -48,10 +51,10 @@ data:
         # The annotation `notebooks.kubeflow.org/http-headers-request-set`
         # is applied to notebook in this group, configuring Istio
         # to add the `X-RStudio-Root-Path` header to requests
-        value: public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:master-164fa2ea
+        value: ghcr.io/pluralsh/kubeflow-notebooks-rstudio-tidyverse:v1.0.0
         # The list of available standard container Images
         options:
-          - public.ecr.aws/j1r0q0g6/notebooks/notebook-servers/rstudio-tidyverse:master-164fa2ea
+          - ghcr.io/pluralsh/kubeflow-notebooks-rstudio-tidyverse:v1.0.0
       allowCustomImage: true
       # If true, users can input custom images
       # If false, users can only select from the images in this config