InitContainer to delete docker.sock if it's a directory

Author: manics

helm-chart/binderhub/templates/container-builder/daemonset.yaml

@@ -2,6 +2,7 @@
 {{- $builderName := .Values.imageBuilderType -}}
 {{- $builder := index .Values $builderName -}}
 {{- $daemonset := $builder.daemonset -}}
+{{- $hostSocketPath := printf "%s/%s" $builder.hostSocketDir $builder.hostSocketName }}
 
 apiVersion: apps/v1
 kind: DaemonSet
@@ -36,10 +37,33 @@ spec:
         value: user
       nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }}
 
-      {{- with $builder.initContainers }}
+      {{- if or $builder.cleanupIncorrectSocketDir $builder.initContainers }}
       initContainers:
+      {{- if $builder.cleanupIncorrectSocketDir }}
+        - name: filesystem
+          # Reuse the main container image since this is a simple shell command
+          image: {{ $daemonset.image.name }}:{{ $daemonset.image.tag }}
+          {{- with $daemonset.image.pullPolicy }}
+          imagePullPolicy: {{ . }}
+          {{- end }}
+          command:
+            - sh
+            - -c
+            - >
+              if [ -d "{{ $hostSocketPath }}" ]; then
+                echo "Removing incorrect socket directory {{ $hostSocketPath }}";
+                rmdir "{{ $hostSocketPath }}"";
+              fi
+          securityContext:
+            privileged: true
+          volumeMounts:
+          - name: run-{{ $builderName }}
+            mountPath: {{ $builder.hostSocketDir }}
+      {{- end }}
+      {{- with $builder.initContainers }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
+      {{- end }}
 
       containers:
         - name: {{ $builderName }}
@@ -55,7 +79,7 @@ spec:
           args:
             - dockerd
             - --storage-driver={{ $builder.storageDriver }}
-            - -H unix://{{ $builder.hostSocketDir }}/{{ $builder.hostSocketName }}
+            - -H unix://{{ $hostSocketPath }}
             {{- with $daemonset.extraArgs }}
             {{- . | toYaml | nindent 12 }}
             {{- end }}
@@ -73,7 +97,7 @@ spec:
             - system
             - service
             - --time=0
-            - unix://{{ $builder.hostSocketDir }}/{{ $builder.hostSocketName }}
+            - unix://{{ $hostSocketPath }}
             {{- with $daemonset.extraArgs }}
             {{- . | toYaml | nindent 12 }}
             {{- end }}

helm-chart/binderhub/values.yaml

@@ -284,6 +284,7 @@ dind:
     lifecycle: {}
     extraVolumes: []
     extraVolumeMounts: []
+  cleanupIncorrectSocketDir: true
   storageDriver: overlay2
   resources: {}
   hostSocketDir: /var/run/dind
@@ -302,6 +303,7 @@ pink:
     lifecycle: {}
     extraVolumes: []
     extraVolumeMounts: []
+  cleanupIncorrectSocketDir: true
   resources: {}
   hostStorageDir: /var/lib/pink/storage
   hostSocketDir: /var/run/pink