From c14280e8d399b0db512989cfc33f8b1344d41f91 Mon Sep 17 00:00:00 2001 From: David Eads Date: Wed, 18 Dec 2019 08:41:57 -0500 Subject: [PATCH] prevent blocking wait in cert reloading --- .../pkg/server/dynamiccertificates/configmap_cafile_content.go | 2 +- .../pkg/server/dynamiccertificates/dynamic_cafile_content.go | 2 +- .../pkg/server/dynamiccertificates/dynamic_serving_content.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/configmap_cafile_content.go b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/configmap_cafile_content.go index dad6fc30630..d2b01dfbbe2 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/configmap_cafile_content.go +++ b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/configmap_cafile_content.go @@ -217,7 +217,7 @@ func (c *ConfigMapCAController) Run(workers int, stopCh <-chan struct{}) { go wait.Until(c.runWorker, time.Second, stopCh) // start timer that rechecks every minute, just in case. this also serves to prime the controller quickly. - _ = wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { + go wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { c.queue.Add(workItemKey) return false, nil }, stopCh) diff --git a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go index 09b5e616a43..6dbd3bee606 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go +++ b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_cafile_content.go @@ -170,7 +170,7 @@ func (c *DynamicFileCAContent) Run(workers int, stopCh <-chan struct{}) { go wait.Until(c.runWorker, time.Second, stopCh) // start timer that rechecks every minute, just in case. this also serves to prime the controller quickly. - _ = wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { + go wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { c.queue.Add(workItemKey) return false, nil }, stopCh) diff --git a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_serving_content.go b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_serving_content.go index 39be47fb07d..94d956d418e 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_serving_content.go +++ b/staging/src/k8s.io/apiserver/pkg/server/dynamiccertificates/dynamic_serving_content.go @@ -133,7 +133,7 @@ func (c *DynamicFileServingContent) Run(workers int, stopCh <-chan struct{}) { go wait.Until(c.runWorker, time.Second, stopCh) // start timer that rechecks every minute, just in case. this also serves to prime the controller quickly. - _ = wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { + go wait.PollImmediateUntil(FileRefreshDuration, func() (bool, error) { c.queue.Add(workItemKey) return false, nil }, stopCh)