Merge pull request #55128 from foxyriver/fix-timer

Automatic merge from submit-queue (batch tested with PRs 54602, 54877, 55243, 55509, 55128). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. stop timer **What this PR does / why we need it**: stop the timer after using it

Merge pull request #55128 from foxyriver/fix-timer
8bdd6614 · Kubernetes Submit Queue · GitHub · b2125f5a · cdc4aca9 · 8bdd6614
Unverified Commit 8bdd6614 authored Nov 14, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 14, 2017
Showing with 2 additions and 0 deletions

configuration_manager.go ...rver/pkg/admission/configuration/configuration_manager.go +1 -0

configuration_manager_test.go ...pkg/admission/configuration/configuration_manager_test.go +1 -0

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager.go
@@ -104,6 +104,7 @@ func (a *poller) bootstrapping() {
 	// bootstrapGracePeriod is read-only, so no lock is required
 	timer := time.NewTimer(a.bootstrapGracePeriod)
 	go func() {
+		defer timer.Stop()
 		<-timer.C
 		a.lock.Lock()
 		defer a.lock.Unlock()

--- a/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/admission/configuration/configuration_manager_test.go
@@ -50,6 +50,7 @@ func TestTolerateBootstrapFailure(t *testing.T) {
 	go func() {
 		// The test might have false negative, but won't be flaky
 		timer := time.NewTimer(2 * time.Second)
+		defer timer.Stop()
 		<-timer.C
 		fakeGetSucceedLock.Lock()
 		defer fakeGetSucceedLock.Unlock()