github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct comment around which integrations require cadvisor_stats

Browse Source 
This commit is part of a larger effort to clean up references to `rkt`
in the kubelet.

Previously, this comment hard-coded which integrations required
the cadvisor stats provider. The comment has grown stale
(i.e. referenced rkt and did not reference cri-o).

Update the comment to instead point to the code which determines which
integrations need the cadvisor stats provider.
This commit is contained in:
mattjmcnaughton 2020-01-05 09:21:04 -05:00
parent f5034a6e4a
commit 06b44c76fd
No known key found for this signature in database
GPG Key ID: BC530981A9A1CC9D
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cadvisor/util.go
View File

@ -70,7 +70,7 @@ func EphemeralStorageCapacityFromFsInfo(info cadvisorapi2.FsInfo) v1.ResourceLis
// CRI integrations should get container metrics via CRI. Docker // CRI integrations should get container metrics via CRI. Docker
// uses the built-in cadvisor to gather such metrics on Linux for // uses the built-in cadvisor to gather such metrics on Linux for
// historical reasons. // historical reasons.
// cri-o relies on cadvisor as a temporary workaround. The code should // TODO: cri-o relies on cadvisor as a temporary workaround. The code should
// be removed. Related issue: // be removed. Related issue:
// https://github.com/kubernetes/kubernetes/issues/51798 // https://github.com/kubernetes/kubernetes/issues/51798
func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool { func UsingLegacyCadvisorStats(runtime, runtimeEndpoint string) bool {

6
pkg/kubelet/stats/cadvisor_stats_provider.go
View File

@ -38,8 +38,10 @@ import (
) )
// cadvisorStatsProvider implements the containerStatsProvider interface by // cadvisorStatsProvider implements the containerStatsProvider interface by
// getting the container stats from cAdvisor. This is needed by docker and rkt // getting the container stats from cAdvisor. This is needed by
// integrations since they do not provide stats from CRI. // integrations which do not provide stats from CRI. See
// `pkg/kubelet/cadvisor/util.go#UsingLegacyCadvisorStats` for the logic for
// determining which integrations do not provide stats from CRI.
type cadvisorStatsProvider struct { type cadvisorStatsProvider struct {
// cadvisor is used to get the stats of the cgroup for the containers that // cadvisor is used to get the stats of the cgroup for the containers that
// are managed by pods. // are managed by pods.