make default_url a request query option

SwissDataScienceCenter · Oct 10, 2018 · 33f7758 · 33f7758
1 parent 38e0e6f
commit 33f7758
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/helm-chart/renku-notebooks/templates/deployment.yaml b/helm-chart/renku-notebooks/templates/deployment.yaml
@@ -42,6 +42,8 @@ spec:
             {{ else }}
               value: {{ template "notebooks.http" . }}://{{ .Values.global.renku.domain }}{{ .Values.jupyterhub_base_url }}hub/api
             {{ end }}
+            - name: JUPYTERHUB_SINGLEUSER_DEFAULT_URL
+              value: {{ .Values.jupyterhub.singleuser.defaultUrl }}
             - name: JUPYTERHUB_SERVICE_PREFIX
               value: {{ .Values.jupyterhub_base_url }}services/notebooks/
             - name: JUPYTERHUB_BASE_URL

diff --git a/jupyterhub/spawners.py b/jupyterhub/spawners.py
@@ -291,6 +291,9 @@ def get_pod_manifest(self):
             # set the notebook container image
             self.image_spec = self.image
 
+            # set the default url
+            self.default_url = options.get('default_url')
+
             #: Define a new empty volume.
             self.volumes = [
                 volume for volume in self.volumes if volume['name'] != volume_name

diff --git a/src/notebooks_service.py b/src/notebooks_service.py
@@ -383,8 +383,10 @@ def launch_notebook(user, namespace, project, commit_sha, notebook=None):
     headers = {auth.auth_header_name: 'token {0}'.format(auth.api_token)}
 
     # if there is an image passed with the request, use it
-    image = request.args.get(
-        'image', get_notebook_image(user, namespace, project, commit_sha)
+    image = get_notebook_image(user, namespace, project, commit_sha)
+
+    default_url = request.args.get(
+        'default_url', os.environ.get('JUPYTERHUB_SINGLEUSER_DEFAULT_URL')
     )
 
     payload = {
@@ -394,6 +396,7 @@ def launch_notebook(user, namespace, project, commit_sha, notebook=None):
         'notebook': notebook,
         'project': project,
         'image': image,
+        'default_url': default_url,
     }
     if os.environ.get('GITLAB_REGISTRY_SECRET'):
         payload['image_pull_secrets'] = payload.get('image_pull_secrets', [])