helm-chart: Rely on z2jh to seed hub.services.binder.apiToken

Author: consideRatio

helm-chart/binderhub/templates/deployment.yaml

@@ -98,8 +98,8 @@ spec:
         - name: JUPYTERHUB_API_TOKEN
           valueFrom:
             secretKeyRef:
-              name: binder-secret
-              key: "binder.hub-token"
+              name: "{{ include "jupyterhub.hub.fullname" . }}"
+              key: hub.services.binder.apiToken
         {{- if .Values.config.BinderHub.auth_enabled }}
         - name: JUPYTERHUB_API_URL
           value: {{ (print (.Values.config.BinderHub.hub_url_local | default .Values.config.BinderHub.hub_url | trimSuffix "/") "/hub/api/") }}

helm-chart/binderhub/templates/secret.yaml

@@ -6,7 +6,6 @@ type: Opaque
 data:
   {{- $values :=  dict "config" dict }}
   {{- $cfg := .Values.config }}
-  binder.hub-token: {{ .Values.jupyterhub.hub.services.binder.apiToken | required "jupyterhub.hub.services.binder.apiToken must be explicitly set!" | b64enc | quote }}
   {{- /* every 'pick' here should be matched with a corresponding 'omit' in secret.yaml */ -}}
   {{- if $cfg.GitHubRepoProvider }}
   {{- $_ := set $values.config "GitHubRepoProvider" (pick $cfg.GitHubRepoProvider "client_id" "client_secret" "access_token") }}

testing/k8s-binder-k8s-hub/binderhub-chart-config.yaml

@@ -28,16 +28,10 @@ jupyterhub:
       allowOrigin: "*"
 
   hub:
-    # cookieSecret must be a hex encoded even length string
-    cookieSecret: "cccccccccc"
     db:
       type: "sqlite-memory"
-    services:
-      binder:
-        apiToken: "dummy-binder-secret-token"
 
   proxy:
-    secretToken: "dummy-proxy-secret-token"
     service:
       type: NodePort
       nodePorts:

testing/local-binder-k8s-hub/jupyterhub-chart-config.yaml

@@ -12,16 +12,15 @@ custom:
     allowOrigin: "*"
 
 hub:
-  # cookieSecret must be a hex encoded even length string
-  cookieSecret: "cccccccccc"
   db:
     type: "sqlite-memory"
   services:
     binder:
+      # apiToken is also configured in
+      # testing/local-binder-k8s-hub/binderhub_config.py
       apiToken: "dummy-binder-secret-token"
 
 proxy:
-  secretToken: "dummy-proxy-secret-token"
   service:
     type: NodePort
     nodePorts:

tools/templates/lint-and-validate-values.yaml

@@ -70,7 +70,6 @@ jupyterhub:
     services:
       binder:
         admin: true
-        apiToken: dummy-binder-secret-token
   singleuser:
     cmd: jupyter-notebook
     events: false