move util/metrics to component-base

Signed-off-by: Yassine TIJANI <ytijani@vmware.com>
This commit is contained in:
Yassine TIJANI
2019-08-22 18:40:21 +01:00
parent 24424e26d1
commit c1487840bc
52 changed files with 124 additions and 151 deletions

View File

@@ -17,7 +17,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/controller/cronjob",
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/util/metrics:go_default_library",
"//staging/src/k8s.io/api/batch/v1:go_default_library",
"//staging/src/k8s.io/api/batch/v1beta1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
@@ -33,6 +32,7 @@ go_library(
"//staging/src/k8s.io/client-go/tools/pager:go_default_library",
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
"//staging/src/k8s.io/client-go/tools/reference:go_default_library",
"//staging/src/k8s.io/component-base/metrics/prometheus/ratelimiter:go_default_library",
"//vendor/github.com/robfig/cron:go_default_library",
"//vendor/k8s.io/klog:go_default_library",
],

View File

@@ -50,7 +50,7 @@ import (
"k8s.io/client-go/tools/pager"
"k8s.io/client-go/tools/record"
ref "k8s.io/client-go/tools/reference"
"k8s.io/kubernetes/pkg/util/metrics"
"k8s.io/component-base/metrics/prometheus/ratelimiter"
)
// Utilities for dealing with Jobs and CronJobs and time.
@@ -74,7 +74,7 @@ func NewController(kubeClient clientset.Interface) (*Controller, error) {
eventBroadcaster.StartRecordingToSink(&v1core.EventSinkImpl{Interface: kubeClient.CoreV1().Events("")})
if kubeClient != nil && kubeClient.CoreV1().RESTClient().GetRateLimiter() != nil {
if err := metrics.RegisterMetricAndTrackRateLimiterUsage("cronjob_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter()); err != nil {
if err := ratelimiter.RegisterMetricAndTrackRateLimiterUsage("cronjob_controller", kubeClient.CoreV1().RESTClient().GetRateLimiter()); err != nil {
return nil, err
}
}