Merge pull request #19992 from liggitt/etcd-healthz

etcd healthz, hotloop fixes

Author: openshift-merge-robot

glide.lock

@@ -99,7 +99,8 @@ import:
   version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
 # master: etcd
 - package: github.com/coreos/etcd
-  version: v3.2.16
+  repo:    https://github.com/openshift/coreos-etcd.git
+  version: origin-3.10-etcd-v3.2.16
 - package: google.golang.org/grpc
   version: v1.7.5
 - package: github.com/grpc-ecosystem/grpc-gateway

glide.yaml

@@ -43,7 +43,7 @@ func withAssetServerRedirect(handler http.Handler, accessor *webConsolePublicURL
 func (c *MasterConfig) withConsoleRedirection(handler, assetServerHandler http.Handler, accessor *webConsolePublicURLAccessor) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
 		// blacklist well known paths so we do not risk recursion deadlocks
-		for _, prefix := range []string{"/apis", "/api", "/oapi", "/healtz", "/version"} {
+		for _, prefix := range []string{"/apis", "/api", "/oapi", "/healthz", "/version"} {
 			if req.URL.Path == prefix || strings.HasPrefix(req.URL.Path, prefix+"/") {
 				// Dispatch to the next handler
 				handler.ServeHTTP(w, req)