github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix more metrics rergister errors

pull/564/head
danielqsj 2019-02-22 10:20:09 +08:00
parent 23be9587a0
commit 687d759e36
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/certificates/rootcacertpublisher/publisher.go
View File

@ -47,7 +47,7 @@ func NewPublisher(cmInformer coreinformers.ConfigMapInformer, nsInformer coreinf
e := &Publisher{ e := &Publisher{
client: cl, client: cl,
rootCA: rootCA, rootCA: rootCA,
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "root-ca-cert-publisher"), queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "root_ca_cert_publisher"),
} }
if cl.CoreV1().RESTClient().GetRateLimiter() != nil { if cl.CoreV1().RESTClient().GetRateLimiter() != nil {
if err := metrics.RegisterMetricAndTrackRateLimiterUsage("root_ca_cert_publisher", cl.CoreV1().RESTClient().GetRateLimiter()); err != nil { if err := metrics.RegisterMetricAndTrackRateLimiterUsage("root_ca_cert_publisher", cl.CoreV1().RESTClient().GetRateLimiter()); err != nil {

2
pkg/controller/deployment/progress_test.go
View File

@ -166,7 +166,7 @@ func TestRequeueStuckDeployment(t *testing.T) {
} }
dc := &DeploymentController{ dc := &DeploymentController{
queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "doesnt-matter"), queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "doesnt_matter"),
} }
dc.enqueueDeployment = dc.enqueue dc.enqueueDeployment = dc.enqueue

2
pkg/controller/disruption/disruption_test.go
View File

@ -735,7 +735,7 @@ func TestPDBNotExist(t *testing.T) {
func TestUpdateDisruptedPods(t *testing.T) { func TestUpdateDisruptedPods(t *testing.T) {
dc, ps := newFakeDisruptionController() dc, ps := newFakeDisruptionController()
dc.recheckQueue = workqueue.NewNamedDelayingQueue("pdb-queue") dc.recheckQueue = workqueue.NewNamedDelayingQueue("pdb_queue")
pdb, pdbName := newMinAvailablePodDisruptionBudget(t, intstr.FromInt(1)) pdb, pdbName := newMinAvailablePodDisruptionBudget(t, intstr.FromInt(1))
currentTime := time.Now() currentTime := time.Now()
pdb.Status.DisruptedPods = map[string]metav1.Time{ pdb.Status.DisruptedPods = map[string]metav1.Time{