Fix issue with environment variables be overriden in k8s mode

ml-tooling · Sep 18, 2019 · 5eef2dd · 5eef2dd
1 parent 6f189a6
commit 5eef2dd
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/docker-res/jupyterhub_config.py b/docker-res/jupyterhub_config.py
@@ -23,7 +23,8 @@
 c.Spawner.port = int(os.getenv("DEFAULT_WORKSPACE_PORT", 8080))
 
 # Set default environment variables used by our ml-workspace container
-c.Spawner.environment = {"AUTHENTICATE_VIA_JUPYTER": "true", "SHUTDOWN_INACTIVE_KERNELS": "true"}
+default_env = {"AUTHENTICATE_VIA_JUPYTER": "true", "SHUTDOWN_INACTIVE_KERNELS": "true"}
+c.Spawner.environment = default_env
 
 # Workaround to prevent api problems
 c.Spawner.will_resume = True
@@ -75,6 +76,10 @@
     c.JupyterHub.spawner_class = 'mlhubspawner.MLHubKubernetesSpawner'
     c.KubeSpawner.pod_name_template = c.Spawner.name_template
 
+    if not isinstance(c.KubeSpawner.environment, dict):
+        c.KubeSpawner.environment = {}
+    c.KubeSpawner.environment.update(default_env)
+
 # Add nativeauthenticator-specific templates
 if c.JupyterHub.authenticator_class == NATIVE_AUTHENTICATOR_CLASS:
     import nativeauthenticator