Merge pull request #1182 from erikwilson/docker-pause-image

pkg/agent/config/config.go

@@ -452,11 +452,14 @@ func get(envInfo *cmds.Agent) (*config.Node, error) {
 		nodeConfig.AgentConfig.CNIBinDir = filepath.Dir(hostLocal)
 		nodeConfig.AgentConfig.CNIConfDir = filepath.Join(envInfo.DataDir, "etc/cni/net.d")
 	}
+
 	if !nodeConfig.Docker && nodeConfig.ContainerRuntimeEndpoint == "" {
-		nodeConfig.AgentConfig.RuntimeSocket = "unix://" + nodeConfig.Containerd.Address
+		nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.Containerd.Address
 	} else {
-		nodeConfig.AgentConfig.RuntimeSocket = "unix://" + nodeConfig.ContainerRuntimeEndpoint
+		nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.ContainerRuntimeEndpoint
+		nodeConfig.AgentConfig.CNIPlugin = true
 	}
+
 	if controlConfig.ClusterIPRange != nil {
 		nodeConfig.AgentConfig.ClusterCIDR = *controlConfig.ClusterIPRange
 	}

pkg/agent/run.go

@@ -47,10 +47,7 @@ func run(ctx context.Context, cfg cmds.Agent, lb *loadbalancer.LoadBalancer) err
 		}
 	}
 
-	if nodeConfig.Docker || nodeConfig.ContainerRuntimeEndpoint != "" {
-		nodeConfig.AgentConfig.RuntimeSocket = nodeConfig.ContainerRuntimeEndpoint
-		nodeConfig.AgentConfig.CNIPlugin = true
-	} else {
+	if !nodeConfig.Docker && nodeConfig.ContainerRuntimeEndpoint == "" {
 		if err := containerd.Run(ctx, nodeConfig); err != nil {
 			return err
 		}

pkg/agent/templates/templates.go

@@ -29,8 +29,6 @@ const ContainerdConfigTemplate = `
 
 {{- if .NodeConfig.AgentConfig.PauseImage }}
   sandbox_image = "{{ .NodeConfig.AgentConfig.PauseImage }}"
-{{else}}
-  sandbox_image = "docker.io/rancher/pause:3.1"
 {{end}}
 
 {{- if not .NodeConfig.NoFlannel }}

pkg/cli/cmds/agent.go

@@ -82,8 +82,9 @@ var (
 	}
 	PauseImageFlag = cli.StringFlag{
 		Name:        "pause-image",
-		Usage:       "(agent/runtime) Customized pause image for containerd sandbox",
+		Usage:       "(agent/runtime) Customized pause image for containerd or docker sandbox",
 		Destination: &AgentConfig.PauseImage,
+		Value:       "docker.io/rancher/pause:3.1",
 	}
 	FlannelFlag = cli.BoolFlag{
 		Name:        "no-flannel",

pkg/daemons/agent/agent.go

@@ -94,6 +94,8 @@ func startKubelet(cfg *config.Agent) {
 		argsMap["container-runtime"] = "remote"
 		argsMap["container-runtime-endpoint"] = cfg.RuntimeSocket
 		argsMap["serialize-image-pulls"] = "false"
+	} else if cfg.PauseImage != "" {
+		argsMap["pod-infra-container-image"] = cfg.PauseImage
 	}
 	if cfg.ListenAddress != "" {
 		argsMap["address"] = cfg.ListenAddress