From 919ac45746e361808e16f5096f86f608b642a7c0 Mon Sep 17 00:00:00 2001
From: Piotr Palka <ppalka@spoton.com>
Date: Thu, 4 Jul 2024 22:18:22 +0700
Subject: [PATCH 1/2] feat(dind): allow to adjust log level and image name

---
 charts/gha-runner-scale-set/templates/_helpers.tpl |  3 ++-
 charts/gha-runner-scale-set/values.yaml            | 11 ++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/charts/gha-runner-scale-set/templates/_helpers.tpl b/charts/gha-runner-scale-set/templates/_helpers.tpl
index bd71ed64..925fd3d9 100644
--- a/charts/gha-runner-scale-set/templates/_helpers.tpl
+++ b/charts/gha-runner-scale-set/templates/_helpers.tpl
@@ -96,11 +96,12 @@ volumeMounts:
 {{- end }}
 
 {{- define "gha-runner-scale-set.dind-container" -}}
-image: docker:dind
+image: {{ .Values.template.spec.dind.image }}
 args:
   - dockerd
   - --host=unix:///var/run/docker.sock
   - --group=$(DOCKER_GROUP_GID)
+  - --log-level={{ .Values.template.spec.dind.logLevel }}
 env:
   - name: DOCKER_GROUP_GID
     value: "123"
diff --git a/charts/gha-runner-scale-set/values.yaml b/charts/gha-runner-scale-set/values.yaml
index 6018b7d0..f4d34050 100644
--- a/charts/gha-runner-scale-set/values.yaml
+++ b/charts/gha-runner-scale-set/values.yaml
@@ -132,11 +132,12 @@ template:
   ##         - name: dind-sock
   ##           mountPath: /var/run
   ##     - name: dind
-  ##       image: docker:dind
+  ##       image: {{ .Values.template.spec.dind.image }}
   ##       args:
   ##         - dockerd
   ##         - --host=unix:///var/run/docker.sock
   ##         - --group=$(DOCKER_GROUP_GID)
+  ##         - --log-level={{ .Values.template.spec.dind.logLevel }}
   ##       env:
   ##         - name: DOCKER_GROUP_GID
   ##           value: "123"
@@ -187,6 +188,14 @@ template:
   ##                 requests:
   ##                   storage: 1Gi
   spec:
+    dind:
+      ## Log level of the ephemeral runners. Use one of the following values: "debug", "info", "warn", "error", "fatal".
+      ## Defaults to "info".
+      logLevel: info
+      ## Set a dind image for sidecar container. Eg: use a specific registry in cloud environment to speed up the image pulling process and cut down external network traffic cost.
+      ## For AWS based deployments 'public.ecr.aws/docker/library/docker:dind' may be a good choice.
+      ## Defaults to "docker:dind".
+      image: docker:dind
     containers:
       - name: runner
         image: ghcr.io/actions/actions-runner:latest

From 427ad933657c202fa4829f7b5a3a1d6a43665f7b Mon Sep 17 00:00:00 2001
From: Piotr Palka <ppalka@spoton.com>
Date: Thu, 4 Jul 2024 22:29:33 +0700
Subject: [PATCH 2/2] comment clarification

---
 charts/gha-runner-scale-set/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gha-runner-scale-set/values.yaml b/charts/gha-runner-scale-set/values.yaml
index f4d34050..d6272ee4 100644
--- a/charts/gha-runner-scale-set/values.yaml
+++ b/charts/gha-runner-scale-set/values.yaml
@@ -189,7 +189,7 @@ template:
   ##                   storage: 1Gi
   spec:
     dind:
-      ## Log level of the ephemeral runners. Use one of the following values: "debug", "info", "warn", "error", "fatal".
+      ## Log level of the Docker daemon. Use one of the following values: "debug", "info", "warn", "error", "fatal".
       ## Defaults to "info".
       logLevel: info
       ## Set a dind image for sidecar container. Eg: use a specific registry in cloud environment to speed up the image pulling process and cut down external network traffic cost.