From 6f130c2db5e572e667455b647dd8c6f81dfe8d41 Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Tue, 13 Jul 2021 18:14:15 +0900 Subject: [PATCH] Fix dockerdWithinRunnerContainer for Runner(Deployment) not working in the main branch (#696) Ref https://github.com/actions-runner-controller/actions-runner-controller/pull/674#issuecomment-878600993 --- controllers/runner_controller.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index 41c09bcb..870afa29 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -616,11 +616,15 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) { EnvFrom: runner.Spec.EnvFrom, Env: runner.Spec.Env, Resources: runner.Spec.Resources, - }, corev1.Container{ - Name: "docker", - VolumeMounts: runner.Spec.DockerVolumeMounts, - Resources: runner.Spec.DockerdContainerResources, }) + + if runner.Spec.DockerdWithinRunnerContainer == nil || !*runner.Spec.DockerdWithinRunnerContainer { + template.Spec.Containers = append(template.Spec.Containers, corev1.Container{ + Name: "docker", + VolumeMounts: runner.Spec.DockerVolumeMounts, + Resources: runner.Spec.DockerdContainerResources, + }) + } } else { template.Spec.Containers = runner.Spec.Containers }