github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #88911 from tkashem/readyz-shutdown

Browse Source 
/readyz should start returning failure on shutdown initiation
This commit is contained in:
Kubernetes Prow Robot 2020-03-06 14:53:34 -08:00 committed by GitHub
commit ab40772439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/apiserver/pkg/server/genericapiserver.go
View File

@ -318,8 +318,14 @@ func (s preparedGenericAPIServer) Run(stopCh <-chan struct{}) error {
go func() { go func() {
defer close(delayedStopCh) defer close(delayedStopCh)
<-stopCh <-stopCh
// As soon as shutdown is initiated, /readyz should start returning failure.
// This gives the load balancer a window defined by ShutdownDelayDuration to detect that /readyz is red
// and stop sending traffic to this server.
close(s.readinessStopCh)
time.Sleep(s.ShutdownDelayDuration) time.Sleep(s.ShutdownDelayDuration)
}() }()
@ -379,7 +385,6 @@ func (s preparedGenericAPIServer) NonBlockingRun(stopCh <-chan struct{}) error {
// ensure cleanup. // ensure cleanup.
go func() { go func() {
<-stopCh <-stopCh
close(s.readinessStopCh)
close(internalStopCh) close(internalStopCh)
if stoppedCh != nil { if stoppedCh != nil {
<-stoppedCh <-stoppedCh