Merge pull request kubernetes#75700 from logicalhan/reflector-cleanup

k8s-ci-robot · web-flow · commit 7dfcacd1cfcb · 2019-03-25T23:13:31.000-07:00
cleanup of reflector metric code (finish removing unused code)
diff --git a/cmd/kube-apiserver/app/BUILD b/cmd/kube-apiserver/app/BUILD
@@ -29,7 +29,6 @@ go_library(
         "//pkg/registry/rbac/rest:go_default_library",
         "//pkg/serviceaccount:go_default_library",
         "//pkg/util/flag:go_default_library",
-        "//pkg/util/reflector/prometheus:go_default_library",
         "//pkg/util/workqueue/prometheus:go_default_library",
         "//pkg/version:go_default_library",
         "//pkg/version/verflag:go_default_library",
diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go
@@ -78,7 +78,6 @@ import (
 	rbacrest "k8s.io/kubernetes/pkg/registry/rbac/rest"
 	"k8s.io/kubernetes/pkg/serviceaccount"
 	utilflag "k8s.io/kubernetes/pkg/util/flag"
-	_ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration
 	_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration
 	"k8s.io/kubernetes/pkg/version"
 	"k8s.io/kubernetes/pkg/version/verflag"
diff --git a/pkg/util/BUILD b/pkg/util/BUILD
@@ -43,7 +43,6 @@ filegroup(
         "//pkg/util/pod:all-srcs",
         "//pkg/util/procfs:all-srcs",
         "//pkg/util/prometheusclientgo:all-srcs",
-        "//pkg/util/reflector/prometheus:all-srcs",
         "//pkg/util/removeall:all-srcs",
         "//pkg/util/resizefs:all-srcs",
         "//pkg/util/resourcecontainer:all-srcs",
diff --git a/pkg/util/prometheusclientgo/BUILD b/pkg/util/prometheusclientgo/BUILD
@@ -8,7 +8,6 @@ go_library(
     deps = [
         "//pkg/client/metrics/prometheus:go_default_library",
         "//pkg/util/prometheusclientgo/leaderelection:go_default_library",
-        "//pkg/util/reflector/prometheus:go_default_library",
         "//pkg/util/workqueue/prometheus:go_default_library",
     ],
 )
diff --git a/pkg/util/prometheusclientgo/adapters.go b/pkg/util/prometheusclientgo/adapters.go
@@ -20,6 +20,5 @@ package prometheusclientgo
 import (
 	_ "k8s.io/kubernetes/pkg/client/metrics/prometheus"              // for client metric registration
 	_ "k8s.io/kubernetes/pkg/util/prometheusclientgo/leaderelection" // for leader election metric registration
-	_ "k8s.io/kubernetes/pkg/util/reflector/prometheus"              // for reflector metric registration
 	_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus"              // for workqueue metric registration
 )
diff --git a/pkg/util/reflector/prometheus/BUILD b/pkg/util/reflector/prometheus/BUILD
diff --git a/pkg/util/reflector/prometheus/prometheus.go b/pkg/util/reflector/prometheus/prometheus.go

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,6 @@ go_library(`
`8`	`8`	`deps = [`
`9`	`9`	`"//pkg/client/metrics/prometheus:go_default_library",`
`10`	`10`	`"//pkg/util/prometheusclientgo/leaderelection:go_default_library",`
`11`		`- "//pkg/util/reflector/prometheus:go_default_library",`
`12`	`11`	`"//pkg/util/workqueue/prometheus:go_default_library",`
`13`	`12`	`],`
`14`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,5 @@ package prometheusclientgo`
`20`	`20`	`import (`
`21`	`21`	`_ "k8s.io/kubernetes/pkg/client/metrics/prometheus" // for client metric registration`
`22`	`22`	`_ "k8s.io/kubernetes/pkg/util/prometheusclientgo/leaderelection" // for leader election metric registration`
`23`		`- _ "k8s.io/kubernetes/pkg/util/reflector/prometheus" // for reflector metric registration`
`24`	`23`	`_ "k8s.io/kubernetes/pkg/util/workqueue/prometheus" // for workqueue metric registration`
`25`	`24`	`)`