Skip to content

Commit 5d6dc8d

Browse files
committed
cadvisor: add Disk metrics with LocalStorageCapacityIsolation
needed for cadvisor commit e3affc1b79faa2901d7210948e92a5416166eb28 Signed-off-by: Giuseppe Scrivano <[email protected]>
1 parent e94aebf commit 5d6dc8d

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

pkg/kubelet/cadvisor/BUILD

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ go_library(
3030
"//vendor/github.com/google/cadvisor/info/v2:go_default_library",
3131
] + select({
3232
"@io_bazel_rules_go//go/platform:android": [
33+
"//pkg/features:go_default_library",
34+
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
3335
"//vendor/github.com/google/cadvisor/cache/memory:go_default_library",
3436
"//vendor/github.com/google/cadvisor/container:go_default_library",
3537
"//vendor/github.com/google/cadvisor/container/containerd/install:go_default_library",
@@ -46,6 +48,8 @@ go_library(
4648
"//vendor/k8s.io/utils/pointer:go_default_library",
4749
],
4850
"@io_bazel_rules_go//go/platform:linux": [
51+
"//pkg/features:go_default_library",
52+
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
4953
"//vendor/github.com/google/cadvisor/cache/memory:go_default_library",
5054
"//vendor/github.com/google/cadvisor/container:go_default_library",
5155
"//vendor/github.com/google/cadvisor/container/containerd/install:go_default_library",

pkg/kubelet/cadvisor/cadvisor_linux.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ import (
4444
cadvisorapiv2 "github.com/google/cadvisor/info/v2"
4545
"github.com/google/cadvisor/manager"
4646
"github.com/google/cadvisor/utils/sysfs"
47+
utilfeature "k8s.io/apiserver/pkg/util/feature"
4748
"k8s.io/klog/v2"
49+
kubefeatures "k8s.io/kubernetes/pkg/features"
4850
"k8s.io/utils/pointer"
4951
)
5052

@@ -96,7 +98,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [
9698
cadvisormetrics.AppMetrics: struct{}{},
9799
cadvisormetrics.ProcessMetrics: struct{}{},
98100
}
99-
if usingLegacyStats {
101+
if usingLegacyStats || utilfeature.DefaultFeatureGate.Enabled(kubefeatures.LocalStorageCapacityIsolation) {
100102
includedMetrics[cadvisormetrics.DiskUsageMetrics] = struct{}{}
101103
}
102104

0 commit comments

Comments
 (0)