From 23be9587a0f8677eb8091464098881df939c44a9 Mon Sep 17 00:00:00 2001 From: danielqsj Date: Thu, 14 Feb 2019 09:15:44 +0800 Subject: [PATCH 1/2] fix the disruption-recheck metrics register error --- pkg/controller/disruption/disruption.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/disruption/disruption.go b/pkg/controller/disruption/disruption.go index 1ad58e5205e..1658d515602 100644 --- a/pkg/controller/disruption/disruption.go +++ b/pkg/controller/disruption/disruption.go @@ -119,7 +119,7 @@ func NewDisruptionController( dc := &DisruptionController{ kubeClient: kubeClient, queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "disruption"), - recheckQueue: workqueue.NewNamedDelayingQueue("disruption-recheck"), + recheckQueue: workqueue.NewNamedDelayingQueue("disruption_recheck"), broadcaster: record.NewBroadcaster(), } dc.recorder = dc.broadcaster.NewRecorder(scheme.Scheme, v1.EventSource{Component: "controllermanager"}) From 687d759e362b05dcdf11e336e2799704918e048d Mon Sep 17 00:00:00 2001 From: danielqsj Date: Fri, 22 Feb 2019 10:20:09 +0800 Subject: [PATCH 2/2] fix more metrics rergister errors --- pkg/controller/certificates/rootcacertpublisher/publisher.go | 2 +- pkg/controller/deployment/progress_test.go | 2 +- pkg/controller/disruption/disruption_test.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/controller/certificates/rootcacertpublisher/publisher.go b/pkg/controller/certificates/rootcacertpublisher/publisher.go index 34036c14ed4..a0cde41e7a4 100644 --- a/pkg/controller/certificates/rootcacertpublisher/publisher.go +++ b/pkg/controller/certificates/rootcacertpublisher/publisher.go @@ -47,7 +47,7 @@ func NewPublisher(cmInformer coreinformers.ConfigMapInformer, nsInformer coreinf e := &Publisher{ client: cl, 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 err := metrics.RegisterMetricAndTrackRateLimiterUsage("root_ca_cert_publisher", cl.CoreV1().RESTClient().GetRateLimiter()); err != nil { diff --git a/pkg/controller/deployment/progress_test.go b/pkg/controller/deployment/progress_test.go index 444bda998e7..05679c6bc9d 100644 --- a/pkg/controller/deployment/progress_test.go +++ b/pkg/controller/deployment/progress_test.go @@ -166,7 +166,7 @@ func TestRequeueStuckDeployment(t *testing.T) { } dc := &DeploymentController{ - queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "doesnt-matter"), + queue: workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "doesnt_matter"), } dc.enqueueDeployment = dc.enqueue diff --git a/pkg/controller/disruption/disruption_test.go b/pkg/controller/disruption/disruption_test.go index fdd92d8b6c2..d46f30b4e09 100644 --- a/pkg/controller/disruption/disruption_test.go +++ b/pkg/controller/disruption/disruption_test.go @@ -735,7 +735,7 @@ func TestPDBNotExist(t *testing.T) { func TestUpdateDisruptedPods(t *testing.T) { dc, ps := newFakeDisruptionController() - dc.recheckQueue = workqueue.NewNamedDelayingQueue("pdb-queue") + dc.recheckQueue = workqueue.NewNamedDelayingQueue("pdb_queue") pdb, pdbName := newMinAvailablePodDisruptionBudget(t, intstr.FromInt(1)) currentTime := time.Now() pdb.Status.DisruptedPods = map[string]metav1.Time{