diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index bd82e5ba6ee..92a2a3ca254 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -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 } diff --git a/pkg/kubelet/server/server.go b/pkg/kubelet/server/server.go index f234c48cf23..5d230755ab8 100644 --- a/pkg/kubelet/server/server.go +++ b/pkg/kubelet/server/server.go @@ -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{