feat: rename any form of act runner to gitea runner or runner (#149)

fix: https://gitea.com/gitea/helm-actions/issues/142
Reviewed-on: https://gitea.com/gitea/helm-actions/pulls/149
Reviewed-by: Nicolas <bircni@icloud.com>
Co-authored-by: Daan <dselen@nerthus.nl>
Co-committed-by: Daan <dselen@nerthus.nl>

templates/01-consistency-checks.yaml

@@ -1,5 +1,4 @@
 {{- if .Values.enabled -}}
-
     {{- if or (empty .Values.existingSecret) (empty .Values.existingSecretKey) -}}
         {{- fail "existingSecret and existingSecretKey are required when provisioning is disabled" -}}
     {{- end -}}

templates/_helpers.tpl

@@ -20,7 +20,7 @@ If release name contains chart name it will be used as a full name.
   {{- if contains $name .Release.Name -}}
     {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
     {{- else -}}
-    {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+    {{- printf "%s" .Release.Name | trunc 63 | trimSuffix "-" -}}
   {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -61,10 +61,10 @@ version: {{ default .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end -}}
 
-{{- define "gitea.actions.labels.actRunner" -}}
+{{- define "gitea.actions.labels.runner" -}}
 helm.sh/chart: {{ include "gitea.actions.chart" . }}
-app: {{ include "gitea.actions.name" . }}-act-runner
-{{ include "gitea.actions.selectorLabels.actRunner" . }}
+app: {{ include "gitea.actions.name" . }}-runner
+{{ include "gitea.actions.selectorLabels.runner" . }}
 app.kubernetes.io/version: {{ default .Chart.AppVersion | quote }}
 version: {{ default .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
@@ -78,8 +78,8 @@ app.kubernetes.io/name: {{ include "gitea.actions.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
-{{- define "gitea.actions.selectorLabels.actRunner" -}}
-app.kubernetes.io/name: {{ include "gitea.actions.name" . }}-act-runner
+{{- define "gitea.actions.selectorLabels.runner" -}}
+app.kubernetes.io/name: {{ include "gitea.actions.name" . }}-runner
 app.kubernetes.io/instance: {{ .Release.Name }}
 {{- end -}}
 
@@ -112,8 +112,8 @@ Common create image implementation
 {{/*
 Create image for the Gitea Actions Act Runner
 */}}
-{{- define "gitea.actions.actRunner.image" -}}
-{{ include "gitea.actions.common.image" (dict "root" . "image" .Values.statefulset.actRunner) }}
+{{- define "gitea.actions.runner.image" -}}
+{{ include "gitea.actions.common.image" (dict "root" . "image" .Values.statefulset.runner) }}
 {{- end -}}
 
 {{/*

templates/configmap.yaml

@@ -3,13 +3,13 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "gitea.actions.fullname" . }}-act-runner-config
+  name: {{ include "gitea.actions.fullname" . }}-runner-configmap
   namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     {{- include "gitea.actions.labels" . | nindent 4 }}
 data:
   config.yaml: |
-    {{- with .Values.statefulset.actRunner.config -}}
+    {{- with .Values.statefulset.runner.config -}}
     {{- if kindIs "string" . -}}
       {{ . | nindent 4}}
     {{- else -}}

templates/statefulset.yaml

@@ -5,7 +5,7 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   labels:
-    {{- include "gitea.actions.labels.actRunner" . | nindent 4 }}
+    {{- include "gitea.actions.labels.runner" . | nindent 4 }}
     {{- with .Values.statefulset.labels }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
@@ -13,19 +13,19 @@ metadata:
     {{- with .Values.statefulset.annotations }}
     {{- toYaml . | nindent 4 }}
     {{- end }}
-  name: {{ include "gitea.actions.fullname" . }}-act-runner
+  name: {{ include "gitea.actions.fullname" . }}-runner
   namespace: {{ .Values.namespace | default .Release.Namespace }}
 spec:
   replicas: {{ .Values.statefulset.replicas | default 1 }}
   selector:
     matchLabels:
-      {{- include "gitea.actions.selectorLabels.actRunner" . | nindent 6 }}
+      {{- include "gitea.actions.selectorLabels.runner" . | nindent 6 }}
   template:
     metadata:
       annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/config-act-runner.yaml") . | sha256sum }}
+        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       labels:
-        {{- include "gitea.actions.labels.actRunner" . | nindent 8 }}
+        {{- include "gitea.actions.labels.runner" . | nindent 8 }}
         {{- with .Values.statefulset.labels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
@@ -49,7 +49,7 @@ spec:
         {{- if .Values.preExtraInitContainers }}
         {{- toYaml .Values.preExtraInitContainers | nindent 8 }}
         {{- end }}
-        {{- if .Values.statefulset.actRunner.flushCache }}
+        {{- if .Values.statefulset.runner.flushCache }}
         - name: cache-flusher
           image: "{{ include "gitea.actions.init.image" . }}"
           command:
@@ -64,7 +64,7 @@ spec:
               fi
           volumeMounts:
             - mountPath: /data
-              name: data-act-runner
+              name: data-runner
         {{- end }}
         - name: init-gitea
           image: "{{ include "gitea.actions.init.image" . }}"
@@ -128,9 +128,9 @@ spec:
         {{- toYaml .Values.postExtraInitContainers | nindent 8 }}
         {{- end }}
       containers:
-        - name: act-runner
-          image: "{{ include "gitea.actions.actRunner.image" . }}"
-          imagePullPolicy: {{ .Values.statefulset.actRunner.pullPolicy }}
+        - name: runner
+          image: "{{ include "gitea.actions.runner.image" . }}"
+          imagePullPolicy: {{ .Values.statefulset.runner.pullPolicy }}
           workingDir: /data
           env:
             - name: GITEA_RUNNER_REGISTRATION_TOKEN
@@ -141,24 +141,24 @@ spec:
             - name: GITEA_INSTANCE_URL
               value: {{ include "gitea.actions.local_root_url" . }}
             - name: CONFIG_FILE
-              value: /actrunner/config.yaml
+              value: /runner/config.yaml
             - name: TZ
               value: {{ .Values.statefulset.timezone | default "Etc/UTC" }}
-            {{- if .Values.statefulset.actRunner.extraEnvs }}
-            {{- toYaml .Values.statefulset.actRunner.extraEnvs | nindent 12 }}
+            {{- if .Values.statefulset.runner.extraEnvs }}
+            {{- toYaml .Values.statefulset.runner.extraEnvs | nindent 12 }}
             {{- end }}
           resources:
             {{- toYaml .Values.statefulset.resources | nindent 12 }}
           volumeMounts:
-            - mountPath: /actrunner/config.yaml
-              name: act-runner-config
+            - mountPath: /runner/config.yaml
+              name: runner-config
               subPath: config.yaml
             - mountPath: /var/run/docker.sock
               name: docker-socket
               subPath: docker.sock
             - mountPath: /data
-              name: data-act-runner
-            {{- with .Values.statefulset.actRunner.extraVolumeMounts }}
+              name: data-runner
+            {{- with .Values.statefulset.runner.extraVolumeMounts }}
             {{- toYaml . | nindent 12 }}
             {{- end }}
       {{- if .Values.global.imagePullSecrets }}
@@ -180,9 +180,9 @@ spec:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       volumes:
-        - name: act-runner-config
+        - name: runner-config
           configMap:
-            name: {{ include "gitea.actions.fullname" . }}-act-runner-config
+            name: {{ include "gitea.actions.fullname" . }}-runner-configmap
         - name: docker-socket
           emptyDir: {}
         {{- with .Values.statefulset.extraVolumes }}
@@ -190,7 +190,7 @@ spec:
         {{- end }}
   volumeClaimTemplates:
     - metadata:
-        name: data-act-runner
+        name: data-runner
       spec:
         accessModes: [ "ReadWriteOnce" ]
         {{- include "gitea.actions.persistence.storageClass" . | indent 8 }}