Merge pull request #1303 from sgaist/add_lifecycle_support_dind

Add config options to dind.deamonset: lifecycle, extraVolumes, extraVolumeMounts

Author: consideRatio

helm-chart/binderhub/templates/dind/daemonset.yaml

@@ -51,6 +51,13 @@ spec:
           mountPath: /var/lib/docker
         - name: rundind
           mountPath: {{ .Values.dind.hostSocketDir }}
+        {{- with .Values.dind.daemonset.extraVolumeMounts }}
+        {{- . | toYaml | nindent 8 }}
+        {{- end }}
+        {{- with .Values.dind.daemonset.lifecycle }}
+        lifecycle:
+          {{- . | toYaml | nindent 10 }}
+        {{- end }}
       terminationGracePeriodSeconds: 30
       volumes:
       - name: dockerlib-dind
@@ -61,4 +68,7 @@ spec:
         hostPath:
           path: {{ .Values.dind.hostSocketDir }}
           type: DirectoryOrCreate
+      {{- with .Values.dind.daemonset.extraVolumes }}
+      {{- . | toYaml | nindent 6 }}
+      {{- end }}
 {{- end }}

helm-chart/binderhub/values.yaml

@@ -166,6 +166,9 @@ dind:
       tag: 19.03.5-dind
     # Additional command line arguments to pass to dockerd
     extraArgs: []
+    lifecycle: {}
+    extraVolumes: []
+    extraVolumeMounts: []
   storageDriver: overlay2
   resources: {}
   hostSocketDir: /var/run/dind