Skip to content
This repository was archived by the owner on Mar 17, 2023. It is now read-only.

Commit fed1802

Browse files
authored
Merge pull request #117 from vpavlin/feature/update-jsp-0.6.3
Update JSP to 0.6.3
2 parents a72f4ec + 31e7969 commit fed1802

3 files changed

Lines changed: 145 additions & 143 deletions

File tree

.jupyter/jupyterhub_config.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,19 @@
99
# Do not shut down singleuser servers on restart
1010
c.JupyterHub.cleanup_servers = False
1111

12-
custom_notebook_namespace = os.environ.get('NOTEBOOK_NAMESPACE')
13-
if not custom_notebook_namespace:
14-
custom_notebook_namespace = None;
15-
1612
import uuid
1713
jsp_api_dict = {
1814
'KUBERNETES_SERVICE_HOST': os.environ['KUBERNETES_SERVICE_HOST'],
1915
'KUBERNETES_SERVICE_PORT': os.environ['KUBERNETES_SERVICE_PORT'],
20-
'JUPYTERHUB_LOGIN_URL': None,
21-
'NOTEBOOK_NAMESPACE': custom_notebook_namespace
16+
'JUPYTERHUB_LOGIN_URL': None
2217
}
2318

19+
custom_notebook_namespace = os.environ.get('NOTEBOOK_NAMESPACE')
20+
if not custom_notebook_namespace:
21+
custom_notebook_namespace = None;
22+
else:
23+
jsp_api_dict['NOTEBOOK_NAMESPACE'] = custom_notebook_namespace #Set only if not None, None type in env vars causes subprocess.py to crash with error
24+
2425
from jupyterhub_singleuser_profiles.openshift import OpenShift
2526

2627
openshift = OpenShift(namespace=namespace)

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ verify_ssl = true
77

88
[packages]
99
openshift = "==0.11.2"
10-
jupyterhub-singleuser-profiles = "==0.6.0"
10+
jupyterhub-singleuser-profiles = "==0.6.3"
1111
oauthenticator = {ref = "d98936da37569b7bb400c6854b07041dce3e7f87",git = "https://github.com/opendatahub-io/oauthenticator.git", editable = true}
1212
jupyterhub-traefik-proxy = {ref = "b468da04bf0057e9baeb458de6c3f9f677cfb79e", git = "https://github.com/opendatahub-io/traefik-proxy.git", editable = true}
1313
jupyterhub-idle-culler = "==1.1"

0 commit comments

Comments
 (0)