Merge pull request openshift#725 from abhinavdahiya/server_200_healthz

server: update healthz to return 200 instead of 204
cgwalters · May 15, 2019 · d489e70 · d489e70
2 parents 716a567 + d7eeed1
commit d489e70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/server/api.go b/pkg/server/api.go
@@ -134,7 +134,7 @@ type healthHandler struct{}
 func (h *healthHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Length", "0")
 	if r.Method == http.MethodGet || r.Method == http.MethodHead {
-		w.WriteHeader(http.StatusNoContent)
+		w.WriteHeader(http.StatusOK)
 		return
 	}
 

diff --git a/pkg/server/api_test.go b/pkg/server/api_test.go
@@ -106,7 +106,7 @@ func TestHealthzHandler(t *testing.T) {
 				return new(ignv2_2types.Config), nil
 			},
 			checkResponse: func(t *testing.T, response *http.Response) {
-				checkStatus(t, response, http.StatusNoContent)
+				checkStatus(t, response, http.StatusOK)
 				checkContentLength(t, response, 0)
 				checkBodyLength(t, response, 0)
 			},
@@ -118,7 +118,7 @@ func TestHealthzHandler(t *testing.T) {
 				return new(ignv2_2types.Config), nil
 			},
 			checkResponse: func(t *testing.T, response *http.Response) {
-				checkStatus(t, response, http.StatusNoContent)
+				checkStatus(t, response, http.StatusOK)
 				checkContentLength(t, response, 0)
 				checkBodyLength(t, response, 0)
 			},
@@ -260,7 +260,7 @@ func TestAPIServer(t *testing.T) {
 				return new(ignv2_2types.Config), nil
 			},
 			checkResponse: func(t *testing.T, response *http.Response) {
-				checkStatus(t, response, http.StatusNoContent)
+				checkStatus(t, response, http.StatusOK)
 				checkContentLength(t, response, 0)
 				checkBodyLength(t, response, 0)
 			},
@@ -272,7 +272,7 @@ func TestAPIServer(t *testing.T) {
 				return new(ignv2_2types.Config), nil
 			},
 			checkResponse: func(t *testing.T, response *http.Response) {
-				checkStatus(t, response, http.StatusNoContent)
+				checkStatus(t, response, http.StatusOK)
 				checkContentLength(t, response, 0)
 				checkBodyLength(t, response, 0)
 			},