From fa03a0df3c29ec8dcd551d5dee9adbfd71076f5f Mon Sep 17 00:00:00 2001 From: Erik Wilson Date: Thu, 16 Jan 2020 10:21:19 -0700 Subject: [PATCH] Run kubelet with containerd flag The containerd flag was accidentally added to kubelet and is deprecated, but needed for cadvisor to properly connect with the k3s containerd socket, so adding for now. --- pkg/daemons/agent/agent.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/daemons/agent/agent.go b/pkg/daemons/agent/agent.go index cb9f9f05ee..1344c5224d 100644 --- a/pkg/daemons/agent/agent.go +++ b/pkg/daemons/agent/agent.go @@ -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