github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1304 from erikwilson/fixup-cadvisor 

Run kubelet with containerd flag
pull/1321/head
Erik Wilson 2020-01-20 15:37:22 -07:00 committed by GitHub
parent 4cacffd7e6 fa03a0df3c
commit 1b23c891dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/daemons/agent/agent.go
View File

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