github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93283 from runzexia/cleanup-unused-container-cache

Browse Source 
clean up unused var containerCache
This commit is contained in:
Kubernetes Prow Robot 2020-08-28 06:36:33 -07:00 committed by GitHub
commit dce91dece3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet.go
View File

@ -1235,7 +1235,6 @@ func (kl *Kubelet) StartGarbageCollection() {
func (kl *Kubelet) initializeModules() error { func (kl *Kubelet) initializeModules() error {
// Prometheus metrics. // Prometheus metrics.
metrics.Register( metrics.Register(
kl.runtimeCache,
collectors.NewVolumeStatsCollector(kl), collectors.NewVolumeStatsCollector(kl),
collectors.NewLogMetricsCollector(kl.StatsProvider.ListPodStats), collectors.NewLogMetricsCollector(kl.StatsProvider.ListPodStats),
) )

1
pkg/kubelet/metrics/BUILD
View File

@ -11,7 +11,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/kubelet/metrics", importpath = "k8s.io/kubernetes/pkg/kubelet/metrics",
deps = [ deps = [
"//pkg/features:go_default_library", "//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/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",

3
pkg/kubelet/metrics/metrics.go
View File

@ -29,7 +29,6 @@ import (
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/features"
kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
) )
// This const block defines the metric names for the kubelet metrics. // This const block defines the metric names for the kubelet metrics.
@ -369,7 +368,7 @@ var (
var registerMetrics sync.Once var registerMetrics sync.Once
// Register registers all metrics. // Register registers all metrics.
func Register(containerCache kubecontainer.RuntimeCache, collectors ...metrics.StableCollector) { func Register(collectors ...metrics.StableCollector) {
// Register the metrics. // Register the metrics.
registerMetrics.Do(func() { registerMetrics.Do(func() {
legacyregistry.MustRegister(NodeName) legacyregistry.MustRegister(NodeName)

4
pkg/kubelet/pleg/generic_test.go
View File

@ -650,9 +650,7 @@ func TestRelistIPChange(t *testing.T) {
} }
func TestRunningPodAndContainerCount(t *testing.T) { func TestRunningPodAndContainerCount(t *testing.T) {
fakeRuntime := &containertest.FakeRuntime{} metrics.Register()
runtimeCache, _ := kubecontainer.NewRuntimeCache(fakeRuntime)
metrics.Register(runtimeCache)
testPleg := newTestGenericPLEG() testPleg := newTestGenericPLEG()
pleg, runtime := testPleg.pleg, testPleg.runtime pleg, runtime := testPleg.pleg, testPleg.runtime