From 4b11b6cab7262117914fe7e3d5aecd6795a45085 Mon Sep 17 00:00:00 2001
From: Massaki Archambault <marchambault@badjware.dev>
Date: Sun, 6 Apr 2025 15:09:37 -0400
Subject: [PATCH] fix runner multiarch

---
 kustomize/bases/gitea/kustomization.yaml      | 13 ++++++++++
 kustomize/bases/gitea/runner-statefulset.yaml | 25 ++++++++++++-------
 .../bases/gitea/scripts/runner-entrypoint.sh  |  8 ++++++
 3 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 kustomize/bases/gitea/scripts/runner-entrypoint.sh

diff --git a/kustomize/bases/gitea/kustomization.yaml b/kustomize/bases/gitea/kustomization.yaml
index efedf32..ae64a2b 100644
--- a/kustomize/bases/gitea/kustomization.yaml
+++ b/kustomize/bases/gitea/kustomization.yaml
@@ -25,6 +25,9 @@ configMapGenerator:
     literals:
       - GITEA_EXTERNAL_HOST=code.badjware.dev
       - GITEA_EXTERNAL_URL=https://code.badjware.dev
+  - name: runner-scripts
+    files:
+      - runner-entrypoint.sh=scripts/runner-entrypoint.sh
 
 replacements:
   - source:
@@ -47,6 +50,16 @@ replacements:
           name: runner-arm64
         fieldPaths:
           - spec.template.spec.containers
+  - source:
+      kind: StatefulSet
+      name: runner-amd64
+      fieldPath: spec.template.spec.volumes
+    targets:
+      - select:
+          kind: StatefulSet
+          name: runner-arm64
+        fieldPaths:
+          - spec.template.spec.volumes
   - source:
       kind: StatefulSet
       name: runner-amd64
diff --git a/kustomize/bases/gitea/runner-statefulset.yaml b/kustomize/bases/gitea/runner-statefulset.yaml
index 3d9d377..3e7ac56 100644
--- a/kustomize/bases/gitea/runner-statefulset.yaml
+++ b/kustomize/bases/gitea/runner-statefulset.yaml
@@ -33,7 +33,7 @@ spec:
       containers:
         - name: runner
           image: gitea/act_runner:nightly
-          command: ["sh", "-c", "while ! nc -z localhost 2376 </dev/null; do echo 'waiting for docker daemon...'; sleep 5; done; /sbin/tini -- run.sh"]
+          command: ["sh", "/scripts/runner-entrypoint.sh"]
           env:
             - name: NAMESPACE
               valueFrom:
@@ -58,12 +58,14 @@ spec:
               value: "1"
           resources:
             requests:
-              memory: 200Mi
-              cpu: 200m
+              memory: 500Mi
+              cpu: 500m
             limits:
-              memory: 200Mi
-              cpu: 200m
+              memory: 500Mi
+              cpu: 500m
           volumeMounts:
+            - name: runner-scripts
+              mountPath: /scripts
             - name: runner-data-pvc
               mountPath: /data
         - name: docker
@@ -74,8 +76,12 @@ spec:
           - name: DOCKER_TLS_CERTDIR
             value: /data/certs
           volumeMounts:
-          - name: runner-data-pvc
-            mountPath: /data
+            - name: runner-data-pvc
+              mountPath: /data
+      volumes:
+        - name: runner-scripts
+          configMap:
+            name: runner-scripts
   volumeClaimTemplates:
     - metadata:
         name: runner-data-pvc
@@ -84,7 +90,7 @@ spec:
           - ReadWriteOnce
         resources:
           requests:
-            storage: 1Gi
+            storage: 100Mi
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -101,7 +107,7 @@ spec:
       app.kubernetes.io/name: gitea
       app.kubernetes.io/component: runner
       app.kubernetes.io/arch: arm64
-  replicas: 1
+  replicas: 2
   template:
     metadata:
       labels:
@@ -119,4 +125,5 @@ spec:
                     values:
                       - arm64
       containers: []
+      volumes: []
   volumeClaimTemplates: []
\ No newline at end of file
diff --git a/kustomize/bases/gitea/scripts/runner-entrypoint.sh b/kustomize/bases/gitea/scripts/runner-entrypoint.sh
new file mode 100644
index 0000000..b75a791
--- /dev/null
+++ b/kustomize/bases/gitea/scripts/runner-entrypoint.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+export GITEA_RUNNER_LABELS="linux:host,linux-$(apk --print-arch):host"
+apk add --no-cache nodejs docker
+while ! nc -z localhost 2376 </dev/null; do
+    echo 'waiting for docker daemon...';
+    sleep 5;
+done
+exec /sbin/tini -- run.sh
\ No newline at end of file