github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #110129 from wojtek-t/fix_notify_signal

Browse Source 
Fix stop signal to drained signal in genericapiserver config
This commit is contained in:
Kubernetes Prow Robot
2022-05-19 09:21:32 -07:00
committed by GitHub
parent a608fba48c b56491e6cf
commit 32773d61c4
2 changed files with 4 additions and 4 deletions
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.
func (c *Config) StopNotify() <-chan struct{} {
return c.lifecycleSignals.ShutdownInitiated.Signaled()
// DrainedNotify returns a lifecycle signal of genericapiserver already drained while shutting down.
func (c *Config) DrainedNotify() <-chan struct{} {
return c.lifecycleSignals.InFlightRequestsDrained.Signaled()
}
// 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 {
healthCheck, err := storagefactory.CreateHealthCheck(s.StorageConfig, c.StopNotify())
healthCheck, err := storagefactory.CreateHealthCheck(s.StorageConfig, c.DrainedNotify())
if err != nil {
return err
}