From d6c66045a0168c8e00f685e1fbf8f21498171392 Mon Sep 17 00:00:00 2001
From: Simon Li <orpheus+devel@gmail.com>
Date: Fri, 23 Feb 2024 18:29:21 +0000
Subject: [PATCH] Don't make cleanupIncorrectSocketDir configurable

---
 helm-chart/binderhub/schema.yaml                            | 6 ------
 .../binderhub/templates/container-builder/daemonset.yaml    | 4 ----
 helm-chart/binderhub/values.yaml                            | 2 --
 3 files changed, 12 deletions(-)

diff --git a/helm-chart/binderhub/schema.yaml b/helm-chart/binderhub/schema.yaml
index 74430e6d7..f3c3249b8 100644
--- a/helm-chart/binderhub/schema.yaml
+++ b/helm-chart/binderhub/schema.yaml
@@ -414,11 +414,6 @@ properties:
             type: array
             description: |
               Additional volume mounts for the Container. Use a k8s native syntax.
-      cleanupIncorrectSocketDir: &cleanupIncorrectSocketDir-spec
-        type: boolean
-        description: |
-          If the container socket has been incorrectly created as a directory
-          remove the directory
       storageDriver:
         type: string
         description: |
@@ -454,7 +449,6 @@ properties:
           lifecycle: *lifecycle-spec
           extraVolumes: *extraVolumes-spec
           extraVolumeMounts: *extraVolumeMounts-spec
-      cleanupIncorrectSocketDir: *cleanupIncorrectSocketDir-spec
       resources: *resources-spec
       hostStorageDir: *hostStorageDir-spec
       hostSocketDir: *hostSocketDir-spec
diff --git a/helm-chart/binderhub/templates/container-builder/daemonset.yaml b/helm-chart/binderhub/templates/container-builder/daemonset.yaml
index acdc026b1..427c20e8d 100644
--- a/helm-chart/binderhub/templates/container-builder/daemonset.yaml
+++ b/helm-chart/binderhub/templates/container-builder/daemonset.yaml
@@ -37,9 +37,7 @@ spec:
         value: user
       nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }}
 
-      {{- 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 }}
@@ -59,11 +57,9 @@ spec:
           volumeMounts:
           - name: run-{{ $builderName }}
             mountPath: {{ $builder.hostSocketDir }}
-      {{- end }}
       {{- with $builder.initContainers }}
         {{- . | toYaml | nindent 8 }}
       {{- end }}
-      {{- end }}
 
       containers:
         - name: {{ $builderName }}
diff --git a/helm-chart/binderhub/values.yaml b/helm-chart/binderhub/values.yaml
index 33e4f825b..d1756d452 100644
--- a/helm-chart/binderhub/values.yaml
+++ b/helm-chart/binderhub/values.yaml
@@ -284,7 +284,6 @@ dind:
     lifecycle: {}
     extraVolumes: []
     extraVolumeMounts: []
-  cleanupIncorrectSocketDir: true
   storageDriver: overlay2
   resources: {}
   hostSocketDir: /var/run/dind
@@ -303,7 +302,6 @@ pink:
     lifecycle: {}
     extraVolumes: []
     extraVolumeMounts: []
-  cleanupIncorrectSocketDir: true
   resources: {}
   hostStorageDir: /var/lib/pink/storage
   hostSocketDir: /var/run/pink