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

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>

Always set pod-infra-container-image to protect it from image GC
360f18d1 · Brad Davidson · Brad Davidson · 0710a719 · 360f18d1 · 360f18d1
Commit 360f18d1 authored Mar 10, 2022 by Brad Davidson Committed by Brad Davidson May 11, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

agent_linux.go pkg/daemons/agent/agent_linux.go +2 -1

agent_windows.go pkg/daemons/agent/agent_windows.go +2 -1

No files found.
--- 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 != "" {