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

Merge pull request #82713 from logicalhan/config-health-checks

Browse Source 
[v1.16.1] expose and use an AddHealthChecks method directly on config
This commit is contained in:
Kubernetes Prow Robot 2019-09-16 08:16:39 -07:00 committed by GitHub
commit 61affb3326
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,6 +380,17 @@ type CompletedConfig struct {
*completedConfig *completedConfig
} }
// AddHealthChecks adds a health check to our config to be exposed by the health endpoints
// of our configured apiserver. We should prefer this to adding healthChecks directly to
// the config unless we explicitly want to add a healthcheck only to a specific health endpoint.
func (c *Config) AddHealthChecks(healthChecks ...healthz.HealthChecker) {
for _, check := range healthChecks {
c.HealthzChecks = append(c.HealthzChecks, check)
c.LivezChecks = append(c.LivezChecks, check)
c.ReadyzChecks = append(c.ReadyzChecks, check)
}
}
// 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
// from other fields. If you're going to `ApplyOptions`, do that first. It's mutating the receiver. // from other fields. If you're going to `ApplyOptions`, do that first. It's mutating the receiver.
func (c *Config) Complete(informers informers.SharedInformerFactory) CompletedConfig { func (c *Config) Complete(informers informers.SharedInformerFactory) CompletedConfig {

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

@ -202,7 +202,7 @@ func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error {
if err != nil { if err != nil {
return err return err
} }
c.HealthzChecks = append(c.HealthzChecks, healthz.NamedCheck("etcd", func(r *http.Request) error { c.AddHealthChecks(healthz.NamedCheck("etcd", func(r *http.Request) error {
return healthCheck() return healthCheck()
})) }))
@ -211,8 +211,7 @@ func (s *EtcdOptions) addEtcdHealthEndpoint(c *server.Config) error {
if err != nil { if err != nil {
return err return err
} }
c.AddHealthChecks(kmsPluginHealthzChecks...)
c.HealthzChecks = append(c.HealthzChecks, kmsPluginHealthzChecks...)
} }
return nil return nil