From 7c2d6f4607682e3264e4577410f50804399f603d Mon Sep 17 00:00:00 2001 From: Pete Vilter Date: Thu, 19 Apr 2018 18:34:15 -0400 Subject: [PATCH] server: exempt healthcheck endpoint from authentication check Fixes #24942 Release note: None --- pkg/server/admin_test.go | 4 +--- pkg/server/server.go | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/server/admin_test.go b/pkg/server/admin_test.go index 8e90ca215238..c72c208a1efa 100644 --- a/pkg/server/admin_test.go +++ b/pkg/server/admin_test.go @@ -1041,9 +1041,7 @@ func TestHealthAPI(t *testing.T) { } s.Clock().Update(hlc.Timestamp(self.Expiration).Add(1, 0)) - // Health API is not accessible if the node is not accessible, because it - // cannot verify the authentication session. - expected := "401 Unauthorized" + expected := "503 Service Unavailable" var resp serverpb.HealthResponse for { if err := getAdminJSONProto(s, "health", &resp); !testutils.IsError(err, expected) { diff --git a/pkg/server/server.go b/pkg/server/server.go index 2edc2cd8a43a..b540419c6232 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -1472,6 +1472,8 @@ If problems persist, please see ` + base.DocsURL("cluster-setup-troubleshooting. s.serveMode.set(modeOperational) s.mux.Handle(adminPrefix, authHandler) + // Exempt the health check endpoint from authentication. + s.mux.Handle("/_admin/v1/health", gwMux) s.mux.Handle(ts.URLPrefix, authHandler) s.mux.Handle(statusPrefix, authHandler) s.mux.Handle(authPrefix, gwMux)