Add all c.BinderHub.* properties used in chart to Values.yaml

except for `buildDockerConfig` which is being dealt with seperately. ``` $ git grep Values\\.config\\. -- helm-chart/ helm-chart/binderhub/templates/_helpers.tpl:{{- if .Values.config.BinderHub.buildDockerConfig }} helm-chart/binderhub/templates/_helpers.tpl:{{- $dockerConfig := merge $dockerConfig .Values.config.BinderHub.buildDockerConfig }} helm-chart/binderhub/templates/container-builder/daemonset.yaml: nodeSelector: {{ .Values.config.BinderHub.build_node_selector | default dict | toJson }} helm-chart/binderhub/templates/deployment.yaml: {{- if .Values.config.BinderHub.use_registry }} helm-chart/binderhub/templates/deployment.yaml: {{- if .Values.config.BinderHub.use_registry }} helm-chart/binderhub/templates/deployment.yaml: {{- if .Values.config.BinderHub.auth_enabled }} helm-chart/binderhub/templates/deployment.yaml: value: {{ (print (.Values.config.BinderHub.hub_url_local | default .Values.config.BinderHub.hub_url | trimSuffix "/") "/hub/api/") }} helm-chart/binderhub/templates/deployment.yaml: path: {{ .Values.config.BinderHub.base_url | default "/" }}versions helm-chart/binderhub/templates/deployment.yaml: path: {{ .Values.config.BinderHub.base_url | default "/" }}versions helm-chart/binderhub/templates/image-cleaner.yaml: nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }} helm-chart/binderhub/templates/secret.yaml:{{- if or .Values.config.BinderHub.use_registry .Values.config.BinderHub.buildDockerConfig }} ``` This helps reduce the "hidden" configuration in the Helm Chart.
jupyterhub · Dec 28, 2022 · 5b2ceec · 5b2ceec
1 parent 1b040a6
commit 5b2ceec
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: {}