fixes2

Author: norman-zon

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

@@ -96,9 +96,11 @@ args:
 volumeMounts:
   - name: dind-externals
     mountPath: /home/runner/tmpDir
+{{ if not (empty .Values.runner.dindInitContainer.resources) }}
 resources:
   {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
 {{- end }}
+{{- end }}
 
 {{- define "gha-runner-scale-set.dind-container" -}}
 image: {{ (.Values.runner.dindContainer).image | default "docker:dind" }}
@@ -127,9 +129,11 @@ volumeMounts:
 {{- with (.Values.runner.dindContainer).extraVolumeMounts -}}
   {{- toYaml . | nindent 2 -}}
 {{- end }}
+{{ if not (empty .Values.runner.dindContainer.resources) }}
 resources:
   {{- toYaml .Values.runner.dindContainer.resources | nindent 2 -}}
 {{- end }}
+{{- end }}
 
 {{- define "gha-runner-scale-set.dind-volume" -}}
 - name: dind-sock
@@ -290,7 +294,7 @@ volumeMounts:
   {{- end }}
 {{ if not (empty .Values.runner.runnerContainer.resources) }}
 resources:
-  {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
+  {{- toYaml .Values.runner.runnerContainer.resources | nindent 2 -}}
 {{- end }}
 {{- end }}
 
@@ -384,7 +388,7 @@ volumeMounts:
   {{- end }}
 {{ if not (empty .Values.runner.runnerContainer.resources) }}
 resources:
-  {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
+  {{- toYaml .Values.runner.runnerContainer.resources | nindent 2 -}}
 {{- end }}
 {{- end }}
 
@@ -449,7 +453,7 @@ volumeMounts:
   {{- end }}
 {{ if not (empty .Values.runner.runnerContainer.resources) }}
 resources:
-  {{- toYaml .Values.runner.dindInitContainer.resources | nindent 2 -}}
+  {{- toYaml .Values.runner.runnerContainer.resources | nindent 2 -}}
 {{- end}}
 {{- end}}
 

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

@@ -151,6 +151,10 @@ spec:
         {{- else if eq $containerMode.type "kubernetes" }}
           {{- include "gha-runner-scale-set.kubernetes-mode-work-volume" . | nindent 6 }}
           {{- include "gha-runner-scale-set.extra-volumes" . | nindent 6 }}
+        {{- else }}
+          {{- with .Values.runner.extraVolumes }}
+            {{- toYaml . | nindent 6 }}
+          {{- end }}
           {{- end }}
         {{- end }}
       {{- with .Values.runner.extraPodSpec }}

charts/gha-runner-scale-set/tests/template_test.go

@@ -283,7 +283,7 @@ func TestTemplateRenderedUserProvideSetServiceAccount(t *testing.T) {
 		SetValues: map[string]string{
 			"githubConfigUrl":                    "https://github.com/actions",
 			"githubConfigSecret.github_token":    "gh_token12345",
-			"template.spec.serviceAccountName":   "test-service-account",
+			"runner.serviceAccountName":          "test-service-account",
 			"controllerServiceAccount.name":      "arc",
 			"controllerServiceAccount.namespace": "arc-system",
 		},
@@ -420,14 +420,14 @@ func TestTemplateRenderedAutoScalingRunnerSet_ProvideMetadata(t *testing.T) {
 	options := &helm.Options{
 		Logger: logger.Discard,
 		SetValues: map[string]string{
-			"githubConfigUrl":                     "https://github.com/actions",
-			"githubConfigSecret.github_token":     "gh_token12345",
-			"template.metadata.labels.test1":      "test1",
-			"template.metadata.labels.test2":      "test2",
-			"template.metadata.annotations.test3": "test3",
-			"template.metadata.annotations.test4": "test4",
-			"controllerServiceAccount.name":       "arc",
-			"controllerServiceAccount.namespace":  "arc-system",
+			"githubConfigUrl":                        "https://github.com/actions",
+			"githubConfigSecret.github_token":        "gh_token12345",
+			"runner.extraMetadata.labels.test1":      "test1",
+			"runner.extraMetadata.labels.test2":      "test2",
+			"runner.extraMetadata.annotations.test3": "test3",
+			"runner.extraMetadata.annotations.test4": "test4",
+			"controllerServiceAccount.name":          "arc",
+			"controllerServiceAccount.namespace":     "arc-system",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}
@@ -1781,7 +1781,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_RestartPolicy(t *testing.T) {
 			"githubConfigSecret.github_token":    "gh_token12345",
 			"controllerServiceAccount.name":      "arc",
 			"controllerServiceAccount.namespace": "arc-system",
-			"template.spec.restartPolicy":        "Always",
+			"runner.restartPolicy":               "Always",
 		},
 		KubectlOptions: k8s.NewKubectlOptions("", "", namespaceName),
 	}

charts/gha-runner-scale-set/tests/values_extra_containers.yaml

@@ -11,7 +11,7 @@ runner:
         valueFrom:
           fieldRef:
             fieldPath: spec.nodeName
-      extravolumeMounts:
+      extraVolumeMounts:
       - name: work
         mountPath: /work
       - name: others