Merge pull request kubernetes#87967 from zhan849/harry/controller-queue-metrics

k8s-ci-robot · web-flow · commit 029e1a06d74c · 2020-02-13T16:55:11.000-08:00
register queue metrics in controller manager
diff --git a/cmd/controller-manager/app/BUILD b/cmd/controller-manager/app/BUILD
@@ -23,6 +23,7 @@ go_library(
         "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
         "//staging/src/k8s.io/component-base/config:go_default_library",
         "//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",
+        "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ],
 )
diff --git a/cmd/controller-manager/app/serve.go b/cmd/controller-manager/app/serve.go
@@ -29,6 +29,7 @@ import (
 	"k8s.io/apiserver/pkg/server/routes"
 	componentbaseconfig "k8s.io/component-base/config"
 	"k8s.io/component-base/metrics/legacyregistry"
+	_ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	"k8s.io/kubernetes/pkg/util/configz"
 )

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ go_library(`
`23`	`23`	`"//staging/src/k8s.io/client-go/kubernetes:go_default_library",`
`24`	`24`	`"//staging/src/k8s.io/component-base/config:go_default_library",`
`25`	`25`	`"//staging/src/k8s.io/component-base/metrics/legacyregistry:go_default_library",`
	`26`	`+ "//staging/src/k8s.io/component-base/metrics/prometheus/workqueue:go_default_library",`
`26`	`27`	`"//vendor/k8s.io/klog:go_default_library",`
`27`	`28`	`],`
`28`	`29`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`"k8s.io/apiserver/pkg/server/routes"`
`30`	`30`	`componentbaseconfig "k8s.io/component-base/config"`
`31`	`31`	`"k8s.io/component-base/metrics/legacyregistry"`
	`32`	`+ _ "k8s.io/component-base/metrics/prometheus/workqueue" // for workqueue metric registration`
`32`	`33`	`"k8s.io/kubernetes/pkg/api/legacyscheme"`
`33`	`34`	`"k8s.io/kubernetes/pkg/util/configz"`
`34`	`35`	`)`