From 90ca5b67c93ec57ead0954b9dbaa6d2be9dcebfc Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Mon, 11 Nov 2024 11:56:07 +0100 Subject: [PATCH] Drop verbose flag from runner scale set init-dind-externals copy This follows up https://github.com/github/docs/pull/34015 and resolves the issue brought up in https://github.com/actions/actions-runner-controller/issues/3637 As mentioned in the docs PR as well: Having the verbose flag in there is nice for debugging but it logs a ton of mostly information that isn't interesting most of the time. Plus is slows the cp call down having to output it all. It shouldn't be the default recommended way to run it as such. --- charts/gha-runner-scale-set/templates/_helpers.tpl | 2 +- charts/gha-runner-scale-set/tests/template_test.go | 2 +- charts/gha-runner-scale-set/values.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/gha-runner-scale-set/templates/_helpers.tpl b/charts/gha-runner-scale-set/templates/_helpers.tpl index bd71ed64c9..178ef89c89 100644 --- a/charts/gha-runner-scale-set/templates/_helpers.tpl +++ b/charts/gha-runner-scale-set/templates/_helpers.tpl @@ -87,7 +87,7 @@ app.kubernetes.io/instance: {{ include "gha-runner-scale-set.scale-set-name" . } {{- if eq $val.name "runner" }} image: {{ $val.image }} command: ["cp"] -args: ["-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"] +args: ["-r", "/home/runner/externals/.", "/home/runner/tmpDir/"] volumeMounts: - name: dind-externals mountPath: /home/runner/tmpDir diff --git a/charts/gha-runner-scale-set/tests/template_test.go b/charts/gha-runner-scale-set/tests/template_test.go index 070f1ef191..8f5a833ee5 100644 --- a/charts/gha-runner-scale-set/tests/template_test.go +++ b/charts/gha-runner-scale-set/tests/template_test.go @@ -893,7 +893,7 @@ func TestTemplateRenderedAutoScalingRunnerSet_EnableDinD(t *testing.T) { assert.Equal(t, "init-dind-externals", ars.Spec.Template.Spec.InitContainers[0].Name) assert.Equal(t, "ghcr.io/actions/actions-runner:latest", ars.Spec.Template.Spec.InitContainers[0].Image) assert.Equal(t, "cp", ars.Spec.Template.Spec.InitContainers[0].Command[0]) - assert.Equal(t, "-r -v /home/runner/externals/. /home/runner/tmpDir/", strings.Join(ars.Spec.Template.Spec.InitContainers[0].Args, " ")) + assert.Equal(t, "-r /home/runner/externals/. /home/runner/tmpDir/", strings.Join(ars.Spec.Template.Spec.InitContainers[0].Args, " ")) assert.Len(t, ars.Spec.Template.Spec.Containers, 2, "Template.Spec should have 2 container") assert.Equal(t, "runner", ars.Spec.Template.Spec.Containers[0].Name) diff --git a/charts/gha-runner-scale-set/values.yaml b/charts/gha-runner-scale-set/values.yaml index 6018b7d0e5..364e17e6af 100644 --- a/charts/gha-runner-scale-set/values.yaml +++ b/charts/gha-runner-scale-set/values.yaml @@ -115,7 +115,7 @@ template: ## initContainers: ## - name: init-dind-externals ## image: ghcr.io/actions/actions-runner:latest - ## command: ["cp", "-r", "-v", "/home/runner/externals/.", "/home/runner/tmpDir/"] + ## command: ["cp", "-r", "/home/runner/externals/.", "/home/runner/tmpDir/"] ## volumeMounts: ## - name: dind-externals ## mountPath: /home/runner/tmpDir