Skip to content

K
k3s
Unverified Commit 1b23c891 authored by Erik Wilson's avatar Erik Wilson Committed by GitHub
Browse files
Options

Merge pull request #1304 from erikwilson/fixup-cadvisor

Run kubelet with containerd flag
parents 4cacffd7 fa03a0df
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
pkg/daemons/agent/agent.go
View file @ 1b23c891
...@@ -93,6 +93,7 @@ func startKubelet(cfg *config.Agent) { ...@@ -93,6 +93,7 @@ func startKubelet(cfg *config.Agent) {
if cfg.RuntimeSocket != "" { if cfg.RuntimeSocket != "" {
argsMap["container-runtime"] = "remote" argsMap["container-runtime"] = "remote"
argsMap["container-runtime-endpoint"] = cfg.RuntimeSocket argsMap["container-runtime-endpoint"] = cfg.RuntimeSocket
argsMap["containerd"] = cfg.RuntimeSocket
argsMap["serialize-image-pulls"] = "false" argsMap["serialize-image-pulls"] = "false"
} else if cfg.PauseImage != "" { } else if cfg.PauseImage != "" {
argsMap["pod-infra-container-image"] = cfg.PauseImage argsMap["pod-infra-container-image"] = cfg.PauseImage
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment