github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #86844 from mattjmcnaughton/mattjmcnaughton/update-cadvisor-stats-provider-comment

Browse Source 
Correct comment around which integrations require cadvisor_stats
This commit is contained in:
Kubernetes Prow Robot 2020-01-07 01:13:14 -08:00 committed by GitHub
commit 195e8e3ad9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.