Skip to content

Commit 8d2eb60

Browse files
Merge pull request #55356 from ericchiang/cert-manager-reduce-backoff
Automatic merge from submit-queue (batch tested with PRs 54773, 52523, 47497, 55356, 49429). 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>. certificate manager: reduce max backoff from 128s to 32s For TLS bootstrapping in bootkube we run a kubelet with a control plane run through static pods. That static control plane has an API server and controller manager that approve the kubelet's CSR. Since the kubelet has to wait for the static control plane to come up to be approved, we hit this backoff every time and it actually adds a notable overhead to startup times. kubernetes-retired/bootkube#663 If this choice is somewhat arbitrary, I'd like to see it lowered for 1.9. /assign @jcbsmpsn @mikedanese ```release-note NONE ``` Kubernetes-commit: 0ff21718d127b9fc14bdfc068624e82fb84e99c2
2 parents f72118d + 25ba7d7 commit 8d2eb60

File tree

2 files changed

+57
-57
lines changed

2 files changed

+57
-57
lines changed

Godeps/Godeps.json

+55-55
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

util/certificate/certificate_manager.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -232,15 +232,15 @@ func (m *manager) Start() {
232232
Duration: 2 * time.Second,
233233
Factor: 2,
234234
Jitter: 0.1,
235-
Steps: 7,
235+
Steps: 5,
236236
}
237237
go wait.Forever(func() {
238238
sleepInterval := m.rotationDeadline.Sub(time.Now())
239239
glog.V(2).Infof("Waiting %v for next certificate rotation", sleepInterval)
240240
time.Sleep(sleepInterval)
241241
if err := wait.ExponentialBackoff(backoff, m.rotateCerts); err != nil {
242242
utilruntime.HandleError(fmt.Errorf("Reached backoff limit, still unable to rotate certs: %v", err))
243-
wait.PollInfinite(128*time.Second, m.rotateCerts)
243+
wait.PollInfinite(32*time.Second, m.rotateCerts)
244244
}
245245
}, 0)
246246
}

0 commit comments

Comments
 (0)