helm-chart: support rich extraEnv config using z2jh helper

Author: consideRatio

helm-chart/binderhub/templates/deployment.yaml

@@ -24,10 +24,7 @@ spec:
         release: {{ .Release.Name }}
         heritage: {{ .Release.Service }}
         {{- with .Values.deployment.labels }}
-        # Because toYaml + indent is super flaky
-        {{- range $key, $value := .Values.deployment.labels }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
+        {{- . | toYaml | trimSuffix "\n" | nindent 8 }}
         {{- end }}
       annotations:
         # This lets us autorestart when the configmap changes!
@@ -120,7 +117,7 @@ spec:
         {{- end }}
         {{- end }}
         {{- with .Values.extraEnv }}
-        {{- . | toYaml | nindent 8 }}
+        {{- include "jupyterhub.extraEnv" . | nindent 8 }}
         {{- end }}
         ports:
           - containerPort: 8585

helm-chart/binderhub/values.yaml

@@ -216,5 +216,5 @@ initContainers: []
 lifecycle: {}
 extraVolumes: []
 extraVolumeMounts: []
-extraEnv: []
+extraEnv: {}
 podAnnotations: {}