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

Fix issue with containerd stats missing from cadvisor metrics 

cadvisor still doesn't pull stats via CRI yet, so we have to continue to use the deprecated arg.

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
pull/5833/head
Brad Davidson 2022-07-05 16:52:45 -07:00 committed by Brad Davidson
parent 7dc78d2cee
commit d2089872bb
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,6 +94,7 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["resolv-conf"] = cfg.ResolvConf argsMap["resolv-conf"] = cfg.ResolvConf
} }
if cfg.RuntimeSocket != "" { if cfg.RuntimeSocket != "" {
argsMap["containerd"] = cfg.RuntimeSocket
argsMap["serialize-image-pulls"] = "false" argsMap["serialize-image-pulls"] = "false"
checkRuntimeEndpoint(cfg, argsMap) checkRuntimeEndpoint(cfg, argsMap)
} }

2
pkg/daemons/agent/agent_windows.go
View File

@ -85,7 +85,7 @@ func kubeletArgs(cfg *config.Agent) map[string]string {
argsMap["resolv-conf"] = cfg.ResolvConf argsMap["resolv-conf"] = cfg.ResolvConf
} }
if cfg.RuntimeSocket != "" { if cfg.RuntimeSocket != "" {
argsMap["container-runtime"] = "remote" argsMap["containerd"] = cfg.RuntimeSocket
argsMap["serialize-image-pulls"] = "false" argsMap["serialize-image-pulls"] = "false"
checkRuntimeEndpoint(cfg, argsMap) checkRuntimeEndpoint(cfg, argsMap)
} }