charts: adapt for notebook server options

compatibility with
SwissDataScienceCenter/renku-notebooks#68

charts/minikube-values.yaml

@@ -30,11 +30,8 @@ gitlab:
   demoUserIsAdmin: true
 
 notebooks:
-  jupyterhub_base_url: /jupyterhub/
-  jupyterhub_api_token: notebookstoken
   securityContext:
     enabled: false
-
   jupyterhub:
     rbac:
       enabled: true
@@ -46,7 +43,7 @@ notebooks:
         url: postgres+psycopg2://jupyterhub:jupyterhub@renku-postgresql:5432/jupyterhub
       services:
         notebooks:
-          api_token: notebookstoken
+          apiToken: notebookstoken
     proxy:
       secretToken: f89ddee5ba10f2268fcefcd4e353235c255493095cd65addf29ebebf8df86255
     auth:

charts/renku/requirements.lock

@@ -4,7 +4,7 @@ dependencies:
   version: 0.2.0
 - name: renku-notebooks
   repository: https://swissdatasciencecenter.github.io/helm-charts/
-  version: 0.2.0
+  version: 0.2.1-b0c93bb
 - name: renku-gateway
   repository: https://swissdatasciencecenter.github.io/helm-charts/
   version: 0.2.0
@@ -20,5 +20,5 @@ dependencies:
 - name: minio
   repository: https://kubernetes-charts.storage.googleapis.com
   version: 1.6.0
-digest: sha256:82956b22b3a0ebe5d6a1c6961fb87a1babb07873366235fb62ba85737cc1fc77
-generated: 2018-10-10T08:37:55.598830963+02:00
+digest: sha256:743cc9002730685cfd9ef6238b4fc92b6a605acf09a4919ac7e944acf92eb356
+generated: 2018-10-17T20:00:33.90929279+02:00

charts/renku/requirements.yaml

@@ -6,7 +6,7 @@ dependencies:
 - name: renku-notebooks
   alias: notebooks
   repository: "https://swissdatasciencecenter.github.io/helm-charts/"
-  version: "0.2.0"
+  version: "0.2.1-b0c93bb"
 - name: renku-gateway
   alias: gateway
   repository: "https://swissdatasciencecenter.github.io/helm-charts/"

charts/renku/values.yaml

@@ -60,10 +60,10 @@ ingress:
   ## Annotations for the created ingress
   annotations:
     ## The ingress class
-    kubernetes.io/ingress.class: 'nginx'
+    kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: 'true'
     nginx.ingress.kubernetes.io/proxy-body-size: '0' # Adjust to a reasonable value for production to avoid DOS attacks.
-    nginx.ingress.kubernetes.io/proxy-request-buffering: 'off' # Needed if GitLab is behind this ingress
+    nginx.ingress.kubernetes.io/proxy-request-buffering: off   # Needed if GitLab is behind this ingress
 
   ## Hosts for the ingress
   ## Should include at least the value from `global.renku.domain`
@@ -539,6 +539,25 @@ ui:
 
 # ## Configuration for the notebooks service
 # notebooks:
+  ## serverOptions allow for modifications to the notebook pod resource requests
+  # serverOptions:
+  #   resources:
+  #     cpu_request:
+  #       displayName: Number of CPUs
+  #       type: integer
+  #       default: 1
+  #       range: [1, 4]
+  #     mem_request:
+  #       displayName: Memory
+  #       type: enum
+  #       default: 2Gi
+  #       options: [2Gi, 4Gi, 8Gi]
+  #     gpu:
+  #       displayName: Number of GPUs
+  #       type: integer
+  #       default: 0
+  #       range: [0, 2]
+  #   defaultUrl: /lab
   ## image registry host
   # imageRegistry:
   ## JupyterHub setup
@@ -570,12 +589,12 @@ ui:
 apispec:
   image:
     repository: renku/apispec
-    tag: '0.2.0'
+    tag: '0.2.1'
 
 tests:
   image:
     repository: renku/tests
-    tag: '0.2.0'
+    tag: '0.2.1'
   ## User accounts for running `helm test`
   ## Replace passwords with random strings in a production setup
   #users_json:

scripts/minikube_deploy.py

@@ -103,7 +103,7 @@ def main():
             '--set', 'gateway.keycloakUrl=http://{mip}'.format(mip=minikube_ip()),
             '--set', 'gateway.gitlabUrl=http://{mip}/gitlab'.format(mip=minikube_ip()),
             '--set', 'notebooks.jupyterhub.hub.extraEnv.GITLAB_URL=http://{mip}/gitlab'.format(mip=minikube_ip()),
-            '--set', 'notebooks.imageRegistry=10.100.123.45:8105',
+            '--set', 'notebooks.gitlab.registry.host=10.100.123.45:8105',
             '--set', 'gitlab.registry.externalUrl=http://10.100.123.45:8105/',
             '--timeout', '1800',
         ]