From 1eb135caceffd072741c12f41a226740104e9686 Mon Sep 17 00:00:00 2001 From: Tristan Keen Date: Fri, 10 Sep 2021 09:41:46 +0100 Subject: [PATCH] Correct default image logic --- controllers/runner_controller.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/controllers/runner_controller.go b/controllers/runner_controller.go index 8713c521..845a95f4 100644 --- a/controllers/runner_controller.go +++ b/controllers/runner_controller.go @@ -738,11 +738,6 @@ func newRunnerPod(template corev1.Pod, runnerSpec v1alpha1.RunnerConfig, default dockerdInRunnerPrivileged bool = dockerdInRunner ) - runnerImage := runnerSpec.Image - if runnerImage == "" { - runnerImage = defaultRunnerImage - } - workDir := runnerSpec.WorkDir if workDir == "" { workDir = "/runner/_work" @@ -843,7 +838,13 @@ func newRunnerPod(template corev1.Pod, runnerSpec v1alpha1.RunnerConfig, default } } - runnerContainer.Image = runnerImage + if runnerSpec.Image != "" { + runnerContainer.Image = runnerSpec.Image + } + if runnerContainer.Image == "" { + runnerContainer.Image = defaultRunnerImage + } + if runnerContainer.ImagePullPolicy == "" { runnerContainer.ImagePullPolicy = corev1.PullAlways }