From 8e3a02efa8893d67d44c580f29281c69a549a7e1 Mon Sep 17 00:00:00 2001 From: David Porter Date: Fri, 6 Jan 2023 13:36:44 -0800 Subject: [PATCH] Remove AcceleratorUsageMetrics from kubelet The feature gate is GA'd and enabled by default and the metrics have been removed from cAdvisor. Signed-off-by: David Porter --- pkg/kubelet/cadvisor/cadvisor_linux.go | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 370e374df55..26b5c60eb87 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -39,9 +39,7 @@ import ( cadvisorapiv2 "github.com/google/cadvisor/info/v2" "github.com/google/cadvisor/manager" "github.com/google/cadvisor/utils/sysfs" - utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" - kubefeatures "k8s.io/kubernetes/pkg/features" "k8s.io/utils/pointer" ) @@ -94,11 +92,6 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [ cadvisormetrics.OOMMetrics: struct{}{}, } - // Only add the Accelerator metrics if the feature is inactive - if !utilfeature.DefaultFeatureGate.Enabled(kubefeatures.DisableAcceleratorUsageMetrics) { - includedMetrics[cadvisormetrics.AcceleratorUsageMetrics] = struct{}{} - } - if usingLegacyStats || localStorageCapacityIsolation { includedMetrics[cadvisormetrics.DiskUsageMetrics] = struct{}{} }