diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 2fdd321e583..b039ab963c5 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1235,7 +1235,6 @@ func (kl *Kubelet) StartGarbageCollection() { func (kl *Kubelet) initializeModules() error { // Prometheus metrics. metrics.Register( - kl.runtimeCache, collectors.NewVolumeStatsCollector(kl), collectors.NewLogMetricsCollector(kl.StatsProvider.ListPodStats), ) diff --git a/pkg/kubelet/metrics/BUILD b/pkg/kubelet/metrics/BUILD index 6e7ecadc169..9887c700e7e 100644 --- a/pkg/kubelet/metrics/BUILD +++ b/pkg/kubelet/metrics/BUILD @@ -11,7 +11,6 @@ go_library( importpath = "k8s.io/kubernetes/pkg/kubelet/metrics", deps = [ "//pkg/features:go_default_library", - "//pkg/kubelet/container:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 96c83683fe8..91ee37c8a0e 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -29,7 +29,6 @@ import ( utilfeature "k8s.io/apiserver/pkg/util/feature" "k8s.io/klog/v2" "k8s.io/kubernetes/pkg/features" - kubecontainer "k8s.io/kubernetes/pkg/kubelet/container" ) // This const block defines the metric names for the kubelet metrics. @@ -369,7 +368,7 @@ var ( var registerMetrics sync.Once // Register registers all metrics. -func Register(containerCache kubecontainer.RuntimeCache, collectors ...metrics.StableCollector) { +func Register(collectors ...metrics.StableCollector) { // Register the metrics. registerMetrics.Do(func() { legacyregistry.MustRegister(NodeName) diff --git a/pkg/kubelet/pleg/generic_test.go b/pkg/kubelet/pleg/generic_test.go index bf1cecf26de..a13ea118c40 100644 --- a/pkg/kubelet/pleg/generic_test.go +++ b/pkg/kubelet/pleg/generic_test.go @@ -650,9 +650,7 @@ func TestRelistIPChange(t *testing.T) { } func TestRunningPodAndContainerCount(t *testing.T) { - fakeRuntime := &containertest.FakeRuntime{} - runtimeCache, _ := kubecontainer.NewRuntimeCache(fakeRuntime) - metrics.Register(runtimeCache) + metrics.Register() testPleg := newTestGenericPLEG() pleg, runtime := testPleg.pleg, testPleg.runtime