fixes

Author: norman-zon

charts/gha-runner-scale-set/templates/_helpers.tpl

@@ -185,7 +185,9 @@ resources:
       {{- $filtered = append $filtered $volume -}}
     {{- end -}}
   {{- end -}}
+  {{ if not (empty $filtered) }}
   {{- toYaml $filtered -}}
+  {{- end }}
 {{- end }}
 
 {{- define "gha-runner-scale-set.extra-containers" -}}
@@ -272,23 +274,25 @@ volumeMounts:
       {{- end }}
     {{- end }}
     {{- toYaml . | nindent 2 -}}
-    {{- if $mountWork }}
+  {{- end }}
+  {{- if $mountWork }}
   - name: work
     mountPath: /home/runner/_work
-    {{- end }}
-    {{- if $mountDindCert }}
+  {{- end }}
+  {{- if $mountDindCert }}
   - name: dind-sock
     mountPath: /var/run
-    {{- end }}
-    {{- if $mountGitHubServerTLS }}
+  {{- end }}
+  {{- if $mountGitHubServerTLS }}
   - name: github-server-tls-cert
     mountPath: {{ clean (print $tlsConfig.runnerMountPath "/" $tlsConfig.certificateFrom.configMapKeyRef.key) }}
     subPath: {{ $tlsConfig.certificateFrom.configMapKeyRef.key }}
-    {{- end }}
   {{- end }}
+{{ if not (empty .Values.runner.runnerContainer.resources) }}
 resources:
   {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
 {{- end }}
+{{- end }}
 
 {{- define "gha-runner-scale-set.kubernetes-mode-runner-container" -}}
 image: {{ .Values.runner.runnerContainer.image }}
@@ -368,19 +372,86 @@ volumeMounts:
       {{- end }}
     {{- end }}
     {{- toYaml . | nindent 2 -}}
-    {{- if $mountWork }}
+  {{- end }}
+  {{- if $mountWork }}
   - name: work
     mountPath: /home/runner/_work
-    {{- end }}
-    {{- if $mountGitHubServerTLS }}
+  {{- end }}
+  {{- if $mountGitHubServerTLS }}
   - name: github-server-tls-cert
     mountPath: {{ clean (print $tlsConfig.runnerMountPath "/" $tlsConfig.certificateFrom.configMapKeyRef.key) }}
     subPath: {{ $tlsConfig.certificateFrom.configMapKeyRef.key }}
-    {{- end }}
   {{- end }}
+{{ if not (empty .Values.runner.runnerContainer.resources) }}
 resources:
   {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
 {{- end }}
+{{- end }}
+
+{{- define "gha-runner-scale-set.default-mode-runner-containers" -}}
+image: {{ .Values.runner.runnerContainer.image }}
+command: ["/home/runner/run.sh"]
+{{ if not (empty .Values.runner.runnerContainer.extraArgs) }}
+args:
+  {{- with .Values.runner.runnerContainer.extraArgs }}
+    {{- toYaml . | nindent 2 }}
+  {{- end }}
+{{- end }}
+{{- $tlsConfig := (default (dict) .Values.githubServerTLS) }}
+{{- $setNodeExtraCaCerts := 0 }}
+{{- $setRunnerUpdateCaCerts := 0 }}
+{{- if $tlsConfig.runnerMountPath }}
+  {{- $setNodeExtraCaCerts = 1 }}
+  {{- $setRunnerUpdateCaCerts = 1 }}
+{{- end }}
+{{- $mountGitHubServerTLS := 0 }}
+  {{- if or .Values.runner.runnerContainer.extraEnv $setNodeExtraCaCerts $setRunnerUpdateCaCerts }}
+env:
+  {{- with .Values.runner.runnerContainer.extraEnv }}
+    {{- range $i, $env := . }}
+      {{- if eq $env.name "NODE_EXTRA_CA_CERTS" }}
+        {{- $setNodeExtraCaCerts = 0 }}
+      {{- end }}
+      {{- if eq $env.name "RUNNER_UPDATE_CA_CERTS" }}
+        {{- $setRunnerUpdateCaCerts = 0 }}
+      {{- end }}
+    {{- end }}
+    {{- toYaml . | nindent 2 -}}
+  {{- end }}
+  {{- if $setNodeExtraCaCerts }}
+  - name: NODE_EXTRA_CA_CERTS
+    value: {{ clean (print $tlsConfig.runnerMountPath "/" $tlsConfig.certificateFrom.configMapKeyRef.key) }}
+  {{- end }}
+  {{- if $setRunnerUpdateCaCerts }}
+  - name: RUNNER_UPDATE_CA_CERTS
+    value: "1"
+  {{- end }}
+  {{- if $tlsConfig.runnerMountPath }}
+    {{- $mountGitHubServerTLS = 1 }}
+  {{- end }}
+  {{- end }}
+
+  {{- if or .Values.runner.runnerContainer.extraVolumeMounts $mountGitHubServerTLS }}
+volumeMounts:
+  {{- with .Values.runner.runnerContainer.extraVolumeMounts }}
+    {{- range $i, $volMount := . }}
+      {{- if eq $volMount.name "github-server-tls-cert" }}
+        {{- $mountGitHubServerTLS = 0 }}
+      {{- end }}
+    {{- end }}
+  {{- toYaml . | nindent 2 -}}
+  {{- end }}
+  {{- if $mountGitHubServerTLS }}
+  - name: github-server-tls-cert
+    mountPath: {{ clean (print $tlsConfig.runnerMountPath "/" $tlsConfig.certificateFrom.configMapKeyRef.key) }}
+    subPath: {{ $tlsConfig.certificateFrom.configMapKeyRef.key }}
+  {{- end }}
+  {{- end }}
+{{ if not (empty .Values.runner.runnerContainer.resources) }}
+resources:
+  {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
+{{- end}}
+{{- end}}
 
 {{- define "gha-runner-scale-set.managerRoleName" -}}
 {{- include "gha-runner-scale-set.fullname" . }}-manager

charts/gha-runner-scale-set/templates/autoscalingrunnerset.yaml

@@ -107,7 +107,7 @@ spec:
       {{- end }}
     {{- end }}
     spec:
-      restartPolicy: .Values.runner.restartPolicy
+      restartPolicy: {{ .Values.runner.restartPolicy }}
       {{- $containerMode := .Values.containerMode }}
       {{- if eq $containerMode.type "kubernetes" }}
       serviceAccountName: {{ default (include "gha-runner-scale-set.kubeModeServiceAccountName" .) .Values.runner.serviceAccountName }}
@@ -133,6 +133,10 @@ spec:
       - name: runner
         {{- include "gha-runner-scale-set.kubernetes-mode-runner-container" . | nindent 8 }}
       {{- include "gha-runner-scale-set.extra-containers" . | nindent 4 }}
+      {{- else }}
+      - name: runner
+        {{- include "gha-runner-scale-set.default-mode-runner-containers" . | nindent 8 }}
+      {{- include "gha-runner-scale-set.extra-containers" . | nindent 4 }}
       {{- end }}
       {{- $tlsConfig := (default (dict) .Values.githubServerTLS) }}
       {{- if or .Values.runner.extraVolumes (eq $containerMode.type "dind") (eq $containerMode.type "kubernetes") $tlsConfig.runnerMountPath }}