github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #82887 from yutedz/token-cleaner-type

Browse Source 
[v1.16.1] TokenCleaner#evalSecret should enqueue the key
This commit is contained in:
Kubernetes Prow Robot 2019-09-19 14:21:20 -07:00 committed by GitHub
commit 73505056fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/controller/bootstrap/tokencleaner.go
View File

@ -202,6 +202,11 @@ func (tc *TokenCleaner) evalSecret(o interface{}) {
klog.V(3).Infof("Error deleting Secret: %v", err)
}
} else if ttl > 0 {
tc.queue.AddAfter(o, ttl)
key, err := controller.KeyFunc(o)
if err != nil {
utilruntime.HandleError(err)
return
}
tc.queue.AddAfter(key, ttl)
}
}

5
pkg/controller/bootstrap/tokencleaner_test.go
View File

@ -110,10 +110,11 @@ func TestCleanerExpiredAt(t *testing.T) {
secret := newTokenSecret("tokenID", "tokenSecret")
addSecretExpiration(secret, timeString(2*time.Second))
secrets.Informer().GetIndexer().Add(secret)
cleaner.enqueueSecrets(secret)
expected := []core.Action{}
verifyFunc := func() {
secrets.Informer().GetIndexer().Add(secret)
cleaner.evalSecret(secret)
cleaner.processNextWorkItem()
verifyActions(t, expected, cl.Actions())
}
// token has not expired currently