From d2089872bb6c1e7b4ce3619db493c595b5006f08 Mon Sep 17 00:00:00 2001 From: Brad Davidson Date: Tue, 5 Jul 2022 16:52:45 -0700 Subject: [PATCH] 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 --- pkg/daemons/agent/agent_linux.go | 1 + pkg/daemons/agent/agent_windows.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/daemons/agent/agent_linux.go b/pkg/daemons/agent/agent_linux.go index b1739c200f..d95ac1d1dc 100644 --- a/pkg/daemons/agent/agent_linux.go +++ b/pkg/daemons/agent/agent_linux.go @@ -94,6 +94,7 @@ func kubeletArgs(cfg *config.Agent) map[string]string { argsMap["resolv-conf"] = cfg.ResolvConf } if cfg.RuntimeSocket != "" { + argsMap["containerd"] = cfg.RuntimeSocket argsMap["serialize-image-pulls"] = "false" checkRuntimeEndpoint(cfg, argsMap) } diff --git a/pkg/daemons/agent/agent_windows.go b/pkg/daemons/agent/agent_windows.go index 9dced01c48..fd61d77619 100644 --- a/pkg/daemons/agent/agent_windows.go +++ b/pkg/daemons/agent/agent_windows.go @@ -85,7 +85,7 @@ func kubeletArgs(cfg *config.Agent) map[string]string { argsMap["resolv-conf"] = cfg.ResolvConf } if cfg.RuntimeSocket != "" { - argsMap["container-runtime"] = "remote" + argsMap["containerd"] = cfg.RuntimeSocket argsMap["serialize-image-pulls"] = "false" checkRuntimeEndpoint(cfg, argsMap) }