Merge pull request #1165 from iwilltry42/main

Mounting binderhub_config.py instead of letting it be part of the image

Author: consideRatio

helm-chart/images/binderhub/binderhub_config.py renamed to helm-chart/binderhub/files/binderhub_config.py

@@ -19,3 +19,6 @@ data:
   values.yaml: |
     {{- $values | toYaml | nindent 4 }}
 
+  {{- /* Glob files to allow them to be mounted by the binderhub pod */ -}}
+  {{- /* key=filename: value=content */ -}}
+  {{- (.Files.Glob "files/*").AsConfig | nindent 2 }}

helm-chart/binderhub/templates/configmap.yaml

@@ -64,6 +64,9 @@ spec:
       containers:
       - name: binder
         image: {{ .Values.image.name }}:{{ .Values.image.tag }}
+        args:
+          - --config
+          - /etc/binderhub/config/binderhub_config.py
         volumeMounts:
           - mountPath: /etc/binderhub/config/
             name: config

helm-chart/binderhub/templates/deployment.yaml

@@ -38,11 +38,7 @@ RUN pip install --no-cache-dir \
         *.whl \
         -r requirements.txt
 
-# Copy the binderhub configuration to use.
-# FUTURE: Follow the approach taken in Z2JH:
-#         https://github.com/jupyterhub/zero-to-jupyterhub-k8s/pull/1478
-COPY helm-chart/images/binderhub/binderhub_config.py .
-
-CMD ["python3", "-m", "binderhub"]
+ENTRYPOINT ["python3", "-m", "binderhub"]
+CMD ["--config", "/etc/binderhub/config/binderhub_config.py"]
 ENV PYTHONUNBUFFERED=1
 EXPOSE 8585