github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-19 17:16:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #106282 from bobbypage/cadvisor-v043

Browse Source 
vendor: Bump cAdvisor to v0.43.0
This commit is contained in:
Kubernetes Prow Robot
2021-11-10 08:17:38 -08:00
committed by GitHub
parent d67cbcb8df b6269ce5de
commit b56dc43458
82 changed files with 1639 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [
}
// Create the cAdvisor container manager.
m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, housekeepingConfig, includedMetrics, http.DefaultClient, cgroupRoots, "")
m, err := manager.New(memory.New(statsCacheDuration, nil), sysFs, housekeepingConfig, includedMetrics, http.DefaultClient, cgroupRoots, nil /* containerEnvMetadataWhiteList */, "" /* perfEventsFile */, time.Duration(0) /*resctrlInterval*/)
if err != nil {
return nil, err
}

2
pkg/kubelet/server/server.go
View File

@@ -373,7 +373,7 @@ func (s *Server) InstallDefaultHandlers() {
// Only add the Accelerator metrics if the feature is inactive
// Note: Accelerator metrics will be removed in the future, hence the feature gate.
if !utilfeature.DefaultFeatureGate.Enabled(features.DisableAcceleratorUsageMetrics) {
includedMetrics.Add(cadvisormetrics.MetricKind(cadvisormetrics.AcceleratorUsageMetrics))
includedMetrics[cadvisormetrics.AcceleratorUsageMetrics] = struct{}{}
}
cadvisorOpts := cadvisorv2.RequestOptions{