Merge pull request #21752 from BugRoger/kube_proxy_health_check

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-05 07:23:08 -08:00
commit b0bd196dc5

View File

@ -21,8 +21,13 @@ package main
import (
"k8s.io/kubernetes/cmd/kube-proxy/app"
"k8s.io/kubernetes/cmd/kube-proxy/app/options"
"k8s.io/kubernetes/pkg/healthz"
)
func init() {
healthz.DefaultHealthz()
}
// NewKubeProxy creates a new hyperkube Server object that includes the
// description and flags.
func NewKubeProxy() *Server {