github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 18:31:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109347 from HirazawaUi/master

Browse Source 
the err of "GetKubeletContainer" function should not affect the value of "RuntimeCgroups"
This commit is contained in:
Kubernetes Prow Robot 2022-07-29 13:17:35 -07:00 committed by GitHub
commit d05780e38d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubelet/app/server.go
View File

@ -622,9 +622,7 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
cgroupRoots = append(cgroupRoots, kubeletCgroup) cgroupRoots = append(cgroupRoots, kubeletCgroup)
} }
if err != nil { if s.RuntimeCgroups != "" {
klog.InfoS("Failed to get the container runtime's cgroup. Runtime system container metrics may be missing.", "err", err)
} else if s.RuntimeCgroups != "" {
// RuntimeCgroups is optional, so ignore if it isn't specified // RuntimeCgroups is optional, so ignore if it isn't specified
cgroupRoots = append(cgroupRoots, s.RuntimeCgroups) cgroupRoots = append(cgroupRoots, s.RuntimeCgroups)
} }