Made test-pr pass

templates/statefulset.yaml

@@ -66,10 +66,10 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
-            - name: DOCKER_HOST
-              value: tcp://127.0.0.1:2376
             - name: DOCKER_TLS_VERIFY
               value: "1"
+            - name: DOCKER_HOST
+              value: tcp://127.0.0.1:2376
             - name: DOCKER_CERT_PATH
               value: /certs/client
             - name: GITEA_RUNNER_REGISTRATION_TOKEN
@@ -79,8 +79,6 @@ spec:
                   key: "{{ .Values.existingSecretKey | default "token" }}"
             - name: GITEA_INSTANCE_URL
               value: {{ include "gitea.actions.local_root_url" . }}
-            - name: CONFIG_FILE
-              value: /actrunner/config.yaml
           resources:
             {{- toYaml .Values.statefulset.resources | nindent 12 }}
           volumeMounts:

unittests/helm/statefulset.yaml

@@ -25,7 +25,7 @@ tests:
           apiVersion: apps/v1
           name: gitea-unittests-actions-act-runner
       - equal:
-          path: spec.template.spec.containers[0].env[3]
+          path: spec.template.spec.containers[0].env[5]
           value:
             name: GITEA_RUNNER_REGISTRATION_TOKEN
             valueFrom:
@@ -46,7 +46,7 @@ tests:
           apiVersion: apps/v1
           name: gitea-unittests-actions-act-runner
       - equal:
-          path: spec.template.spec.containers[0].env[3]
+          path: spec.template.spec.containers[0].env[5]
           value:
             name: GITEA_RUNNER_REGISTRATION_TOKEN
             valueFrom:
@@ -85,7 +85,7 @@ tests:
           apiVersion: apps/v1
           name: gitea-unittests-actions-act-runner
       - equal:
-          path: spec.template.spec.containers[0].env[4]
+          path: spec.template.spec.containers[0].env[6]
           value:
             name: GITEA_INSTANCE_URL
             value: "http://git.example.com"
@@ -111,7 +111,7 @@ tests:
           apiVersion: apps/v1
           name: gitea-unittests-actions-act-runner
       - equal:
-          path: spec.template.spec.containers[0].env[4]
+          path: spec.template.spec.containers[0].env[6]
           value:
             name: GITEA_INSTANCE_URL
             value: "http://git.example.com"
@@ -137,7 +137,7 @@ tests:
           apiVersion: apps/v1
           name: gitea-unittests-actions-act-runner
       - equal:
-          path: spec.template.spec.containers[0].env[4]
+          path: spec.template.spec.containers[0].env[6]
           value:
             name: GITEA_INSTANCE_URL
             value: "http://git.example.com"
@@ -148,21 +148,6 @@ tests:
             while ! wget -qO- http://git.example.com > /dev/null; do
               sleep 2
             done
-  - it: allows adding custom environment variables to the docker-in-docker container
-    template: templates/statefulset.yaml
-    set:
-      enabled: true
-      statefulset:
-        dind:
-          extraEnvs:
-            - name: "CUSTOM_ENV_NAME"
-              value: "custom env value"
-    asserts:
-      - equal:
-          path: spec.template.spec.containers[1].env[3]
-          value:
-            name: "CUSTOM_ENV_NAME"
-            value: "custom env value"
   - it: should mount an extra volume in the act runner container
     template: templates/statefulset.yaml
     set: