Merge pull request #1603 from manics/helmchart-config-defaults

Add all `c.BinderHub.*` properties used in chart to Values.yaml
jupyterhub · Dec 29, 2022 · 3afb84c · 3afb84c
2 parents ee4876b + 5b2ceec
commit 3afb84c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/helm-chart/binderhub/templates/container-builder/daemonset.yaml b/helm-chart/binderhub/templates/container-builder/daemonset.yaml
@@ -34,7 +34,7 @@ spec:
         key: hub.jupyter.org_dedicated
         operator: Equal
         value: user
-      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | default dict | toJson }}
+      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }}
 
       {{- with $builder.initContainers }}
       initContainers:

diff --git a/helm-chart/binderhub/templates/deployment.yaml b/helm-chart/binderhub/templates/deployment.yaml
@@ -151,7 +151,7 @@ spec:
         {{- if .Values.deployment.readinessProbe.enabled }}
         readinessProbe:
           httpGet:
-            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
+            path: {{ .Values.config.BinderHub.base_url }}versions
             port: binder
           initialDelaySeconds: {{ .Values.deployment.readinessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.deployment.readinessProbe.periodSeconds }}
@@ -161,7 +161,7 @@ spec:
         {{- if .Values.deployment.livenessProbe.enabled }}
         livenessProbe:
           httpGet:
-            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
+            path: {{ .Values.config.BinderHub.base_url }}versions
             port: binder
           initialDelaySeconds: {{ .Values.deployment.livenessProbe.initialDelaySeconds }}
           periodSeconds: {{ .Values.deployment.livenessProbe.periodSeconds }}

diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
@@ -40,8 +40,13 @@ service:
   loadBalancerIP:
 
 config:
+  # These c.BinderHub properties are referenced by the Helm chart
   BinderHub:
-    # This must equal the default value of c.BinderHub.use_registry
+    # auth_enabled:
+    base_url: /
+    build_node_selector: {}
+    # hub_url:
+    # hub_url_local:
     use_registry: true
 
 extraConfig: {}