Switch to using the official etcd health check.

2015-06-23 21:47:24 -07:00
parent f4e7b5480d
commit f4e97be78e
5 changed files with 72 additions and 4 deletions
--- a/pkg/master/master.go
+++ b/pkg/master/master.go
@@ -715,7 +715,7 @@ func (m *Master) getServersToValidate(c *Config) map[string]apiserver.Server {
 			addr = etcdUrl.Host
 			port = 4001
 		}
-		serversToValidate[fmt.Sprintf("etcd-%d", ix)] = apiserver.Server{Addr: addr, Port: port, Path: "/v2/keys/"}
+		serversToValidate[fmt.Sprintf("etcd-%d", ix)] = apiserver.Server{Addr: addr, Port: port, Path: "/health", Validate: tools.EtcdHealthCheck}
 	}
 	return serversToValidate
 }