Merge branch 'release/0.1.4'

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

docker-res/kubernetes/config.yaml

@@ -1,43 +1,14 @@
 proxy:
   # the secret token should be changed in your deployment ;)
   secretToken: 4bda3bd04f6ae5ia28368bf7b5514712351fd9cf8edb09ce9b26f73500f8aa54b
-  chp:
-    image:
-      name: mltooling/ml-hub
-      tag: 0.2.2-SNAPSHOT
 
 singleuser:
   storage:
     type: none
-  uid: 0
-  fsGid: 0
-  networkPolicy:
-    enabled: true
 
 hub:
   db:
     type: foo
-  image:
-    name: mltooling/ml-hub
-    tag: 0.2.2-SNAPSHOT
-    pullPolicy: Always
-  uid: 0
-  fsGid: 0
-  allowNamedServers: True
-  extraConfig:
-     template_paths: "c.JupyterHub.template_paths = ['/usr/local/lib/python3.6/dist-packages/nativeauthenticator/templates/']"
-
-auth:
-  type: custom
-  dummy:
-    password: 'foo'
-  admin:
-    users:
-    - admin
-  custom:
-    className: nativeauthenticator.NativeAuthenticator
-    config:
-      username_pattern: '^((?!-hub).)*$'
 
 scheduling:
   userScheduler: