github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-26 04:36:00 +00:00
Code Issues Projects Releases Wiki Activity

apiserver: sync with https server shutdown to flush existing connections

Browse Source
This commit is contained in:
Dr. Stefan Schimanski
2019-01-16 15:58:53 +01:00
parent 8743a0e3c6
commit 5b47f99164
7 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/cloud-controller-manager/app/controllermanager.go
View File

@@ -149,7 +149,8 @@ func Run(c *cloudcontrollerconfig.CompletedConfig, stopCh <-chan struct{}) error
if c.SecureServing != nil {
unsecuredMux := genericcontrollermanager.NewBaseHandler(&c.ComponentConfig.Generic.Debugging, checks...)
handler := genericcontrollermanager.BuildHandlerChain(unsecuredMux, &c.Authorization, &c.Authentication)
if err := c.SecureServing.Serve(handler, 0, stopCh); err != nil {
// TODO: handle stoppedCh returned by c.SecureServing.Serve
if _, err := c.SecureServing.Serve(handler, 0, stopCh); err != nil {
return err
}
}