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

Fix stop signal to drained signal in genericapiserver config

Browse Source
This commit is contained in:
Wojciech Tyczyński 2022-05-18 18:55:45 +02:00
parent a1c8e9386a
commit b56491e6cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
staging/src/k8s.io/apiserver/pkg/server/config.go
View File

@ -528,9 +528,9 @@ func completeOpenAPI(config *openapicommon.Config, version *version.Info) {
} }
} }
// StopNotify returns a lifecycle signal of genericapiserver shutting down. // DrainedNotify returns a lifecycle signal of genericapiserver already drained while shutting down.
func (c *Config) StopNotify() <-chan struct{} { func (c *Config) DrainedNotify() <-chan struct{} {
return c.lifecycleSignals.ShutdownInitiated.Signaled() return c.lifecycleSignals.InFlightRequestsDrained.Signaled()
} }
// Complete fills in any fields not set that are required to have valid data and can be derived // Complete fills in any fields not set that are required to have valid data and can be derived

2
staging/src/k8s.io/apiserver/pkg/server/options/etcd.go
View File

@ -226,7 +226,7 @@ func (s *EtcdOptions) ApplyWithStorageFactoryTo(factory serverstorage.StorageFac
} }
func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error { func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error {
healthCheck, err := storagefactory.CreateHealthCheck(s.StorageConfig, c.StopNotify()) healthCheck, err := storagefactory.CreateHealthCheck(s.StorageConfig, c.DrainedNotify())
if err != nil { if err != nil {
return err return err
} }