From 2214117cd1bb009f0ff6de0b53dd514e360365b9 Mon Sep 17 00:00:00 2001 From: RyderXia Date: Tue, 21 Jul 2020 16:57:36 +0800 Subject: [PATCH] clean up unused var containerCache --- pkg/kubelet/metrics/metrics.go | 3 +-- pkg/kubelet/pleg/generic_test.go | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) 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 8c4f17b2e77..6ed03969fe1 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