Merge pull request #54 from UNINETTSigma2/test-updated-jupyter-images

update jupyter service in test
UNINETTSigma2 · Oct 20, 2023 · 42da580 · 42da580
2 parents bbea240 + 2d5831d
commit 42da580
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 10 deletions.
diff --git a/repos/testing/jupyter/Chart.yaml b/repos/testing/jupyter/Chart.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 description: Jupyter notebook with Dataporten integration
 name: jupyter
-version: 0.10.30
+version: 0.10.31
 maintainers:
-- name: Sigma2 AS
-  email: contact@sigma2.no
+  - name: Sigma2 AS
+    email: contact@sigma2.no
 home: https://github.com/UninettSigma2/helm-charts/tree/master/repos/testing/jupyter
 icon: https://bollwyvl.github.io/jupyter.github.io/images/jupyter-sq-text.svg
 keywords:
   - Apache Spark
   - Scala
   - R
-  - VS code
+  - VS Code
diff --git a/repos/testing/jupyter/README.md b/repos/testing/jupyter/README.md
@@ -13,7 +13,7 @@ A [Jupyter Notebook](http://jupyter.org/) is an open-source web application that
 
 ### Advanced
 This application creates a [Jupyter Notebook](https://github.com/UninettSigma2/helm-charts/tree/master/repos/testing/jupyter) instance using the following Dockerfiles:
-  - [uninettSigma2/jupyter-spark](https://github.com/UninettSigma2/helm-charts-dockerfiles/tree/fbbf65f/jupyter-spark/Dockerfile)
+  - [uninettSigma2/jupyter-spark](https://github.com/UninettSigma2/helm-charts-dockerfiles/tree/e077f7c/jupyter-spark/Dockerfile)
 
 #### Values
 | Value name    | Description |

diff --git a/repos/testing/jupyter/schema.yaml b/repos/testing/jupyter/schema.yaml
@@ -6,7 +6,7 @@ properties:
       dockerImage:
         type: string
         examples:
-        - quay.io/nird-toolkit/jupyter-spark:20220826-8ed372f
+        - sigma2as/jupyter-spark:20231016-e077f7c
       env:
         type: object
         properties:
@@ -34,7 +34,7 @@ properties:
           contact_email:
             type: string
             examples:
-            - example@uninett.no
+            - example@sigma2.no
       dataporten:
         type: object
         properties:

diff --git a/repos/testing/jupyter/templates/_helpers.tpl b/repos/testing/jupyter/templates/_helpers.tpl
@@ -91,6 +91,22 @@ c.NotebookApp.allow_remote_access = True
 c.NotebookApp.token = ''
 c.NotebookApp.password = ''
 
+c.ServerProxy.servers = {
+  'code-server': {
+    'command': [
+      'code-server',
+        '--auth=none',
+        '--disable-telemetry',
+        '--port={port}'
+    ], 
+    'timeout': 20,
+    'launcher_entry': {
+      'title': 'VS Code IDE'
+    }
+  }
+}
+
+
 {{- end -}}
 
 # Create /etc/passwd file to contain UID of users we add

diff --git a/repos/testing/jupyter/templates/deployment.yaml b/repos/testing/jupyter/templates/deployment.yaml
@@ -63,6 +63,7 @@ spec:
       initContainers:
       - name: busybox
         image: busybox:1.33.1-glibc
+        imagePullPolicy: IfNotPresent
         securityContext:
           runAsUser: {{ .Values.uid }}
           runAsGroup: {{ .Values.gid }}

diff --git a/repos/testing/jupyter/values.yaml b/repos/testing/jupyter/values.yaml
@@ -16,7 +16,7 @@ persistentStorage:
     readOnly: false
 appstore_generated_data:
   appstore_meta_data:
-    contact_email: "example@uninett.no"
+    contact_email: "example@sigma2.no"
   dataporten:
     scopes:
       - ""
@@ -34,6 +34,10 @@ appstore_generated_data:
       - profile
       - email
     authorized_principals: []
+    owner: provided-by-toolkit
+    userinfo_url: provided-by-toolkit
+    token_url: provided-by-toolkit
+    auth_url: provided-by-toolkit
 uid: 999
 gid: 999
 username: notebook
@@ -44,8 +48,7 @@ advanced:
   env:
     sparkMasterUrl: "local[*]"
     jupyterLab: true
-  dockerImage: quay.io/nird-toolkit/jupyter-spark:20220826-8ed372f
-
+  dockerImage: sigma2as/jupyter-spark:20231016-e077f7c
   githubToken: ""
 authGroupProviders:
   - url: "https://groups-api.dataporten.no/groups/me/groups"