Merge pull request #42519 from jbeda/fix-tokencleaner

Automatic merge from submit-queue Small fix to the bootstrap TokenCleaner Accidentally missed setting options and so the TokenCleaner was in a retry loop. Also moved from using an explicit timer over cached values vs. relying on a short resync timeout. ```release-note ``` Putting this in the 1.6 milestone as this is clearly a bug fix in a new feature.

Merge pull request #42519 from jbeda/fix-tokencleaner
b70a5b19 · Kubernetes Submit Queue · GitHub · 7e37b895 · 100d4c3b · b70a5b19
Commit b70a5b19 authored Mar 04, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 04, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

tokencleaner.go pkg/controller/bootstrap/tokencleaner.go +11 -1

No files found.
--- a/pkg/controller/bootstrap/tokencleaner.go
+++ b/pkg/controller/bootstrap/tokencleaner.go
@@ -25,6 +25,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/pkg/api"
@@ -47,7 +48,9 @@ type TokenCleanerOptions struct {
 // DefaultTokenCleanerOptions returns a set of default options for creating a
 // TokenCleaner
 func DefaultTokenCleanerOptions() TokenCleanerOptions {
-	return TokenCleanerOptions{}
+	return TokenCleanerOptions{
+		TokenSecretNamespace: api.NamespaceSystem,
+	}
 }

 // TokenCleaner is a controller that deletes expired tokens
@@ -97,9 +100,16 @@ func NewTokenCleaner(cl clientset.Interface, options TokenCleanerOptions) *Token
 // Run runs controller loops and returns when they are done
 func (tc *TokenCleaner) Run(stopCh <-chan struct{}) {
 	go tc.secretsController.Run(stopCh)
+	go wait.Until(tc.evalSecrets, 10*time.Second, stopCh)
 	<-stopCh
 }

+func (tc *TokenCleaner) evalSecrets() {
+	for _, obj := range tc.secrets.List() {
+		tc.evalSecret(obj)
+	}
+}
+
 func (tc *TokenCleaner) evalSecret(o interface{}) {
 	secret := o.(*v1.Secret)
 	if isSecretExpired(secret) {