Fix passthrough of SystemDefaultRegistry from server config

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

Fix passthrough of SystemDefaultRegistry from server config
079620de · Brad Davidson · Brad Davidson · f76d6208 · 079620de
Commit 079620de authored May 12, 2021 by Brad Davidson Committed by Brad Davidson May 13, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

config.go pkg/agent/config/config.go +2 -1

No files found.
--- a/pkg/agent/config/config.go
+++ b/pkg/agent/config/config.go
@@ -552,10 +552,11 @@ func get(ctx context.Context, envInfo *cmds.Agent, proxy proxy.Proxy) (*config.N

 	nodeConfig.AgentConfig.PauseImage = envInfo.PauseImage
 	nodeConfig.AgentConfig.AirgapExtraRegistry = envInfo.AirgapExtraRegistry
+	nodeConfig.AgentConfig.SystemDefaultRegistry = controlConfig.SystemDefaultRegistry

 	// Apply SystemDefaultRegistry to PauseImage and AirgapExtraRegistry
 	if controlConfig.SystemDefaultRegistry != "" {
-		if !strings.HasPrefix(nodeConfig.AgentConfig.PauseImage, controlConfig.SystemDefaultRegistry) {
+		if nodeConfig.AgentConfig.PauseImage != "" && !strings.HasPrefix(nodeConfig.AgentConfig.PauseImage, controlConfig.SystemDefaultRegistry) {
 			nodeConfig.AgentConfig.PauseImage = controlConfig.SystemDefaultRegistry + "/" + nodeConfig.AgentConfig.PauseImage
 		}
 		if !slice.ContainsString(nodeConfig.AgentConfig.AirgapExtraRegistry, controlConfig.SystemDefaultRegistry) {