Always set pod-infra-container-image to protect it from image GC

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
3 years ago · 360f18d1cf
parent 0710a7198a
commit 360f18d1cf
2 changed files with 4 additions and 2 deletions
--- a/pkg/daemons/agent/agent_linux.go
+++ b/pkg/daemons/agent/agent_linux.go
@ -96,7 +96,8 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
 	if cfg.RuntimeSocket != "" {
 		argsMap["serialize-image-pulls"] = "false"
 		checkRuntimeEndpoint(cfg, argsMap)
-	} else if cfg.PauseImage != "" {
+	}
+	if cfg.PauseImage != "" {
 		argsMap["pod-infra-container-image"] = cfg.PauseImage
 	}
 	if cfg.ImageServiceSocket != "" {
--- a/pkg/daemons/agent/agent_windows.go
+++ b/pkg/daemons/agent/agent_windows.go
@ -88,7 +88,8 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
 		argsMap["container-runtime"] = "remote"
 		argsMap["serialize-image-pulls"] = "false"
 		checkRuntimeEndpoint(cfg, argsMap)
-	} else if cfg.PauseImage != "" {
+	}
+	if cfg.PauseImage != "" {
 		argsMap["pod-infra-container-image"] = cfg.PauseImage
 	}
 	if cfg.ListenAddress != "" {