From 0b2534ebc906c8e14d0affbdccafb922e2a5c2db Mon Sep 17 00:00:00 2001
From: Mark Huijgen <48476507+mhuijgen@users.noreply.github.com>
Date: Mon, 16 Jun 2025 12:14:18 +0200
Subject: [PATCH] Fix dind sidecar template (#4128)

---
 .../templates/autoscalingrunnerset.yaml             |  8 ++++----
 charts/gha-runner-scale-set/values.yaml             | 13 ++++++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
index 5244e0fc..578a58a1 100644
--- a/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
+++ b/charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml
@@ -166,11 +166,11 @@ spec:
       initContainers:
         {{- if eq $containerMode.type "dind" }}
       - name: init-dind-externals
-        {{- include "gha-runner-scale-set.dind-init-container" . | nindent 8 }}
-        {{- end }}
-        {{- if (ge (.Capabilities.KubeVersion.Minor | int) 29) }}
+          {{- include "gha-runner-scale-set.dind-init-container" . | nindent 8 }}
+          {{- if (ge (.Capabilities.KubeVersion.Minor | int) 29) }}
       - name: dind
-        {{- include "gha-runner-scale-set.dind-container" . | nindent 8 }}
+          {{- include "gha-runner-scale-set.dind-container" . | nindent 8 }}
+          {{- end }}
         {{- end }}
         {{- with .Values.template.spec.initContainers }}
       {{- toYaml . | nindent 6 }}
diff --git a/charts/gha-runner-scale-set/values.yaml b/charts/gha-runner-scale-set/values.yaml
index f8415ba9..f9587827 100644
--- a/charts/gha-runner-scale-set/values.yaml
+++ b/charts/gha-runner-scale-set/values.yaml
@@ -326,9 +326,16 @@ template:
   ##           command:
   ##             - docker
   ##             - info
-##           initialDelaySeconds: 0
-##           failureThreshold: 24
-##           periodSeconds: 5
+  ##         initialDelaySeconds: 0
+  ##         failureThreshold: 24
+  ##         periodSeconds: 5
+  ##       volumeMounts:
+  ##         - name: work
+  ##           mountPath: /home/runner/_work
+  ##         - name: dind-sock
+  ##           mountPath: /var/run
+  ##         - name: dind-externals
+  ##           mountPath: /home/runner/externals
   ##     containers:
   ##     - name: runner
   ##       image: ghcr.io/actions/actions-runner:latest