chore: add maintainers to the chart

CODEOWNERS

@@ -1 +0,0 @@
-* @DaanSelen @volker.raschek @ChristopherHX

Chart.yaml

@@ -19,10 +19,6 @@ maintainers:
   - name: Daan Selen
     email: dselen@nerthus.nl
 
-  # https://gitea.com/volker.raschek
-  - name: Markus Pesch
-    email: markus.pesch+apps@cryptic.systems
-
   # https://gitea.com/ChristopherHX
   - name: Christopher Homberger
     email: christopher.homberger@web.de

README.md

@@ -30,12 +30,12 @@ If `.Values.image.rootless: true`, then the following will occur. In case you us
 | `statefulset.affinity`                    | Affinity for the statefulset                                                                                                                | `{}`                           |
 | `statefulset.extraVolumes`                | Extra volumes for the statefulset                                                                                                           | `[]`                           |
 | `statefulset.actRunner.repository`        | The Gitea act runner image                                                                                                                  | `gitea/act_runner`             |
-| `statefulset.actRunner.tag`               | The Gitea act runner tag                                                                                                                    | `0.2.12`                       |
+| `statefulset.actRunner.tag`               | The Gitea act runner tag                                                                                                                    | `0.2.11`                       |
 | `statefulset.actRunner.pullPolicy`        | The Gitea act runner pullPolicy                                                                                                             | `IfNotPresent`                 |
 | `statefulset.actRunner.extraVolumeMounts` | Allows mounting extra volumes in the act runner container                                                                                   | `[]`                           |
 | `statefulset.actRunner.config`            | Act runner custom configuration. See [Act Runner documentation](https://docs.gitea.com/usage/actions/act-runner#configuration) for details. | `Too complex. See values.yaml` |
 | `statefulset.dind.repository`             | The Docker-in-Docker image                                                                                                                  | `docker`                       |
-| `statefulset.dind.tag`                    | The Docker-in-Docker image tag                                                                                                              | `28.3.3-dind`                  |
+| `statefulset.dind.tag`                    | The Docker-in-Docker image tag                                                                                                              | `25.0.2-dind`                  |
 | `statefulset.dind.pullPolicy`             | The Docker-in-Docker pullPolicy                                                                                                             | `IfNotPresent`                 |
 | `statefulset.dind.extraVolumeMounts`      | Allows mounting extra volumes in the Docker-in-Docker container                                                                             | `[]`                           |
 | `statefulset.dind.extraEnvs`              | Allows adding custom environment variables, such as `DOCKER_IPTABLES_LEGACY`                                                                | `[]`                           |

templates/config-act-runner.yaml

@@ -10,10 +10,6 @@ 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,27 +48,13 @@ 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
             - name: DOCKER_TLS_VERIFY
               value: "1"
             - name: DOCKER_CERT_PATH
-              value: /certs/client
+              value: /certs/server
             - name: GITEA_RUNNER_REGISTRATION_TOKEN
               valueFrom:
                 secretKeyRef:
@@ -84,7 +70,7 @@ spec:
             - mountPath: /actrunner/config.yaml
               name: act-runner-config
               subPath: config.yaml
-            - mountPath: /certs/client
+            - mountPath: /certs/server
               name: docker-certs
             - mountPath: /data
               name: data-act-runner
@@ -100,7 +86,7 @@ spec:
             - name: DOCKER_TLS_VERIFY
               value: "1"
             - name: DOCKER_CERT_PATH
-              value: /certs/client
+              value: /certs/server
             {{- if .Values.statefulset.dind.extraEnvs }}
             {{- toYaml .Values.statefulset.dind.extraEnvs | nindent 12 }}
             {{- end }}
@@ -109,7 +95,7 @@ spec:
           resources:
             {{- toYaml .Values.statefulset.resources | nindent 12 }}
           volumeMounts:
-            - mountPath: /certs/client
+            - mountPath: /certs/server
               name: docker-certs
             {{- with .Values.statefulset.dind.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}

unittests/helm/config-act-runner.yaml

@@ -42,27 +42,3 @@ 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*$'

values.yaml

@@ -39,7 +39,7 @@ statefulset:
 
   actRunner:
     repository: gitea/act_runner
-    tag: 0.2.12
+    tag: 0.2.11
     pullPolicy: IfNotPresent
     extraVolumeMounts: []
 
@@ -52,7 +52,7 @@ statefulset:
 
   dind:
     repository: docker
-    tag: 28.3.3-dind
+    tag: 25.0.2-dind
     pullPolicy: IfNotPresent
     extraVolumeMounts: []