fix lint

Should fix:
- https://gitea.com/gitea/helm-actions/issues/31
- https://gitea.com/gitea/helm-actions/issues/27

Reviewed-on: https://gitea.com/gitea/helm-actions/pulls/35
Reviewed-by: ChristopherHX <christopherhx@noreply.gitea.com>
Co-authored-by: Daan Selen <dselen@nerthus.nl>
Co-committed-by: Daan Selen <dselen@nerthus.nl>

templates/config-act-runner.yaml

@@ -10,6 +10,10 @@ metadata:
 data:
   config.yaml: |
     {{- with .Values.statefulset.actRunner.config -}}
+    {{- if kindIs "string" . -}}
     {{ . | nindent 4}}
+    {{- else -}}
+    {{ toYaml . | nindent 4}}
+    {{- end -}}
     {{- end -}}
 {{- end }}

templates/statefulset.yaml

@@ -48,6 +48,20 @@ spec:
           image: "{{ .Values.statefulset.actRunner.repository }}:{{ .Values.statefulset.actRunner.tag }}"
           imagePullPolicy: {{ .Values.statefulset.actRunner.pullPolicy }}
           workingDir: /data
+          command:
+          # The following is a workaround for: https://gitea.com/gitea/act_runner/issues/731
+          # We must add the docker-cli package for the server AND client cert verification.
+            - sh
+            - -c
+            - |
+              apk add --no-cache docker-cli
+              echo "Waiting for Docker daemon..."
+              until timeout 10 docker info > /dev/null; do
+                echo "Failed, retrying..."
+                sleep 2
+              done
+              echo "Docker is ready, starting act-runner..."
+              exec run.sh
           env:
             - name: DOCKER_HOST
               value: tcp://127.0.0.1:2376

unittests/helm/config-act-runner.yaml

@@ -42,3 +42,27 @@ tests:
             runner:
               labels:
                 - "ubuntu-latest"
+  - it: renders a ConfigMap with inline yaml
+    template: templates/config-act-runner.yaml
+    set:
+      enabled: true
+      statefulset:
+        actRunner:
+          config:
+            container:
+              valid_volumes:
+                - /var/run/docker.sock
+              options: -v /var/run/docker.sock:/var/run/docker.sock
+    asserts:
+      - hasDocuments:
+          count: 1
+      - containsDocument:
+          kind: ConfigMap
+          apiVersion: v1
+          name: gitea-unittests-actions-act-runner-config
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '(?m)^\s*options:\s*-v /var/run/docker.sock:/var/run/docker.sock\s*$'
+      - matchRegex:
+          path: data["config.yaml"]
+          pattern: '(?m)^\s*valid_volumes:\s*\n\s*-\s*/var/run/docker.sock\s*$'