From 5d6dc8d19ce9209fa1e21e587996626f784ebc6a Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 12 Jun 2020 17:04:16 +0200 Subject: [PATCH] cadvisor: add Disk metrics with LocalStorageCapacityIsolation needed for cadvisor commit e3affc1b79faa2901d7210948e92a5416166eb28 Signed-off-by: Giuseppe Scrivano --- pkg/kubelet/cadvisor/BUILD | 4 ++++ pkg/kubelet/cadvisor/cadvisor_linux.go | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/cadvisor/BUILD b/pkg/kubelet/cadvisor/BUILD index ca1cf67a5e0..673068e7f78 100644 --- a/pkg/kubelet/cadvisor/BUILD +++ b/pkg/kubelet/cadvisor/BUILD @@ -30,6 +30,8 @@ go_library( "//vendor/github.com/google/cadvisor/info/v2:go_default_library", ] + select({ "@io_bazel_rules_go//go/platform:android": [ + "//pkg/features:go_default_library", + "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/github.com/google/cadvisor/cache/memory:go_default_library", "//vendor/github.com/google/cadvisor/container:go_default_library", "//vendor/github.com/google/cadvisor/container/containerd/install:go_default_library", @@ -46,6 +48,8 @@ go_library( "//vendor/k8s.io/utils/pointer:go_default_library", ], "@io_bazel_rules_go//go/platform:linux": [ + "//pkg/features:go_default_library", + "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//vendor/github.com/google/cadvisor/cache/memory:go_default_library", "//vendor/github.com/google/cadvisor/container:go_default_library", "//vendor/github.com/google/cadvisor/container/containerd/install:go_default_library", diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 3f1acb1a085..0c701cb98d3 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -44,7 +44,9 @@ 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" ) @@ -96,7 +98,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [ cadvisormetrics.AppMetrics: struct{}{}, cadvisormetrics.ProcessMetrics: struct{}{}, } - if usingLegacyStats { + if usingLegacyStats || utilfeature.DefaultFeatureGate.Enabled(kubefeatures.LocalStorageCapacityIsolation) { includedMetrics[cadvisormetrics.DiskUsageMetrics] = struct{}{} }