helm-chart: revert coupling to jupyterhub.extraEnv helper

Author: consideRatio

helm-chart/binderhub/schema.yaml

@@ -492,38 +492,9 @@ properties:
   extraVolumes: *extraVolumes-spec
   extraVolumeMounts: *extraVolumeMounts-spec
   extraEnv:
-    type: [object, array]
-    additionalProperties: true
+    type: array
     description: |
-      Environment variables to add to the binder pods.
-
-      String literals with `$(ENV_VAR_NAME)` will be expanded by Kubelet which
-      is a part of Kubernetes.
-
-      ```yaml
-      extraEnv:
-        # basic notation (for literal values only)
-        MY_ENV_VARS_NAME1: "my env var value 1"
-
-        # explicit notation (the "name" field takes precedence)
-        CHP_NAMESPACE:
-          name: CHP_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
-
-        # implicit notation (the "name" field is implied)
-        PREFIXED_CHP_NAMESPACE:
-          value: "my-prefix-$(CHP_NAMESPACE)"
-        SECRET_VALUE:
-          valueFrom:
-            secretKeyRef:
-              name: my-k8s-secret
-              key: password
-      ```
-
-      For more information, see the [Kubernetes EnvVar
-      specification](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.19/#envvar-v1-core).
+      Env to add to the binder Pods.
   podAnnotations:
     type: object
     additionalProperties: false

helm-chart/binderhub/templates/deployment.yaml

@@ -117,7 +117,7 @@ spec:
         {{- end }}
         {{- end }}
         {{- with .Values.extraEnv }}
-        {{- include "jupyterhub.extraEnv" . | nindent 8 }}
+        {{- . | toYaml | nindent 8 }}
         {{- end }}
         ports:
           - containerPort: 8585

helm-chart/binderhub/values.yaml

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

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

@@ -147,9 +147,8 @@ lifecycle: *lifecycle
 extraVolumes: []
 extraVolumeMounts: []
 extraEnv: &extraEnv
-  IGNORED_KEY_NAME:
-    name: MOCK_ENV_VAR_NAME1
+  - name: MOCK_ENV_VAR_NAME1
     value: MOCK_ENV_VAR_VALUE1
-  MOCK_ENV_VAR_NAME2:
+  - name: MOCK_ENV_VAR_NAME2
     value: MOCK_ENV_VAR_VALUE2
 podAnnotations: *annotations