public_git
/
actions-runner-controller
mirror of https://github.com/actions-runner-controller/actions-runner-controller.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Yusuke Kuoka 2021-07-13 18:14:15 +09:00 committed by GitHub
parent dcea0f7f79
commit 6f130c2db5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
controllers/runner_controller.go
View File

@ -616,11 +616,15 @@ func (r *RunnerReconciler) newPod(runner v1alpha1.Runner) (corev1.Pod, error) {
EnvFrom: runner.Spec.EnvFrom, EnvFrom: runner.Spec.EnvFrom,
Env: runner.Spec.Env, Env: runner.Spec.Env,
Resources: runner.Spec.Resources, 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 { } else {
template.Spec.Containers = runner.Spec.Containers template.Spec.Containers = runner.Spec.Containers
} }