Skip to content
Permalink
Browse files

Merge pull request #79184 from tallclair/automated-cherry-pick-of-#78…

…313-upstream-release-1.12

Automated cherry pick of #78313: Avoid the default server mux
  • Loading branch information...
feiskyer committed Jun 30, 2019
2 parents 9925431 + 26849d3 commit e3c134023df5dea457638b614ee17ef234dc34a6
@@ -746,9 +746,10 @@ func run(s *options.KubeletServer, kubeDeps *kubelet.Dependencies, stopCh <-chan
}

if s.HealthzPort > 0 {
healthz.DefaultHealthz()
mux := http.NewServeMux()
healthz.InstallHandler(mux)
go wait.Until(func() {
err := http.ListenAndServe(net.JoinHostPort(s.HealthzBindAddress, strconv.Itoa(int(s.HealthzPort))), nil)
err := http.ListenAndServe(net.JoinHostPort(s.HealthzBindAddress, strconv.Itoa(int(s.HealthzPort))), mux)
if err != nil {
glog.Errorf("Starting health server failed: %v", err)
}
@@ -17,5 +17,5 @@ limitations under the License.
// Package healthz implements basic http server health checking.
// Usage:
// import "k8s.io/apiserver/pkg/server/healthz"
// healthz.DefaultHealthz()
// healthz.InstallHandler(mux)
package healthz // import "k8s.io/apiserver/pkg/server/healthz"
@@ -37,15 +37,6 @@ type HealthzChecker interface {
Check(req *http.Request) error
}

var defaultHealthz = sync.Once{}

// DefaultHealthz installs the default healthz check to the http.DefaultServeMux.
func DefaultHealthz(checks ...HealthzChecker) {
defaultHealthz.Do(func() {
InstallHandler(http.DefaultServeMux, checks...)
})
}

// PingHealthz returns true automatically when checked
var PingHealthz HealthzChecker = ping{}

0 comments on commit e3c1340

Please sign in to comment.
You can’t perform that action at this time.