kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86383 from deads2k/cleanup-cert 

prevent blocking wait in cert reloading

Kubernetes-commit: 1c033105ebea36ff2e45fc06cca70bee483b48c4
This commit is contained in:
Kubernetes Publisher 2020-01-03 12:43:41 -08:00
parent 4c3fc8b568 fe6638e697
commit ee27f78aab
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -584,7 +584,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "526b2fff5289"
"Rev": "787fa2adce7c"
},
{
"ImportPath": "k8s.io/component-base",

4
go.mod
View File

@ -47,7 +47,7 @@ require (
gotest.tools v2.2.0+incompatible // indirect
k8s.io/api v0.0.0-20191230033939-7dc09db16fb8
k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526
k8s.io/client-go v0.0.0-20191227015938-526b2fff5289
k8s.io/client-go v0.0.0-20200103113829-787fa2adce7c
k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
@ -61,6 +61,6 @@ replace (
golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
k8s.io/api => k8s.io/api v0.0.0-20191230033939-7dc09db16fb8
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526
k8s.io/client-go => k8s.io/client-go v0.0.0-20191227015938-526b2fff5289
k8s.io/client-go => k8s.io/client-go v0.0.0-20200103113829-787fa2adce7c
k8s.io/component-base => k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab
)

2
go.sum
View File

@ -357,7 +357,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20191230033939-7dc09db16fb8/go.mod h1:cUvsxRRcutO57eFbvcbKsHasCbJP9NF8JA7Q9icijjI=
k8s.io/apimachinery v0.0.0-20191230155340-4d9f99a83526/go.mod h1:f763v4YxJPg8tVQiktAorc+M5Ot35n9qV7zC0bCzr0s=
k8s.io/client-go v0.0.0-20191227015938-526b2fff5289/go.mod h1:lGXQyJl/X4GntUREa90IWFXpZ3q+6WGSUQRYmHc5HuU=
k8s.io/client-go v0.0.0-20200103113829-787fa2adce7c/go.mod h1:+S6KNcqj2QO0Q6GHaJ0M7z8yMCxacfz7+7lJ51fV/ok=
k8s.io/component-base v0.0.0-20191231153918-e498b4d116ab/go.mod h1:z21BE1lrzlWfjf1EP+UOy8xKp199XmlIu34NLrpuKDw=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=

2
pkg/server/dynamiccertificates/configmap_cafile_content.go
View File

@ -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)

2
pkg/server/dynamiccertificates/dynamic_cafile_content.go
View File

@ -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)

2
pkg/server/dynamiccertificates/dynamic_serving_content.go
View File

@ -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)