Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: h2c placement in health server #108

Merged
merged 1 commit into from
Dec 5, 2023
Merged

fix: h2c placement in health server #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions http/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ func (c *HealthServerConfig) AddLivezChecks(checks ...healthz.HealthChecker) {
// HealthServer is an HTTP server with healthz capabilities.
type HealthServer struct {
srv *Server
mux *http.ServeMux

shudownCh chan struct{}

Expand All @@ -165,10 +166,15 @@ type HealthServer struct {

// NewHealthServer returns an HTTP server with healthz capabilities.
func NewHealthServer(ctx context.Context, cfg HealthServerConfig, opts ...SrvOptFunc) *HealthServer {
srv := NewServer(ctx, cfg.Addr, cfg.Handler, opts...)
// Setup the mux early so H2C can attach properly.
mux := http.NewServeMux()
mux.Handle("/", cfg.Handler)

srv := NewServer(ctx, cfg.Addr, mux, opts...)

return &HealthServer{
srv: srv,
mux: mux,
shudownCh: make(chan struct{}),
readyzChecks: cfg.ReadyzChecks,
livezChecks: cfg.LivezChecks,
Expand Down Expand Up @@ -215,17 +221,13 @@ func (s *HealthServer) Serve(errFn func(error)) {
}

func (s *HealthServer) installChecks() {
mux := http.NewServeMux()
s.installLivezChecks(mux)
s.installLivezChecks(s.mux)

// When shutdown is started, the readyz check should start failing.
if err := s.AddReadyzChecks(shutdownCheck{ch: s.shudownCh}); err != nil {
s.log.Error("Could not install readyz shutdown check", lctx.Err(err))
}
s.installReadyzChecks(mux)

mux.Handle("/", s.srv.srv.Handler)
s.srv.srv.Handler = mux
s.installReadyzChecks(s.mux)
}

func (s *HealthServer) installReadyzChecks(mux *http.ServeMux) {
Expand Down
Loading