From 883f33df6cd9e74924832716a053cf482bde1740 Mon Sep 17 00:00:00 2001 From: David Ashpole Date: Thu, 20 Jun 2019 16:16:08 -0700 Subject: [PATCH] kunsupported cgroup setup causes kubelet to emit a warning rather than exiting --- cmd/kubelet/app/server.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 139a8eacbb3..f3367f33f5f 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -625,17 +625,15 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan cgroupRoots = append(cgroupRoots, cm.NodeAllocatableRoot(s.CgroupRoot, s.CgroupDriver)) kubeletCgroup, err := cm.GetKubeletContainer(s.KubeletCgroups) if err != nil { - return fmt.Errorf("failed to get the kubelet's cgroup: %v", err) - } - if kubeletCgroup != "" { + klog.Warningf("failed to get the kubelet's cgroup: %v. Kubelet system container metrics may be missing.", err) + } else if kubeletCgroup != "" { cgroupRoots = append(cgroupRoots, kubeletCgroup) } runtimeCgroup, err := cm.GetRuntimeContainer(s.ContainerRuntime, s.RuntimeCgroups) if err != nil { - return fmt.Errorf("failed to get the container runtime's cgroup: %v", err) - } - if runtimeCgroup != "" { + klog.Warningf("failed to get the container runtime's cgroup: %v. Runtime system container metrics may be missing.", err) + } else if runtimeCgroup != "" { // RuntimeCgroups is optional, so ignore if it isn't specified cgroupRoots = append(cgroupRoots, runtimeCgroup) }