Skip to content

Commit 3611001

Browse files
Merge pull request #19952 from liggitt/log-healthz
Add log check to /healthz
2 parents b0ba202 + 02a656f commit 3611001

File tree

6 files changed

+30
-2
lines changed

6 files changed

+30
-2
lines changed

pkg/cmd/openshift-controller-manager/controller/standalone_apiserver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func RunControllerServer(servingInfo configapi.HTTPServingInfo, kubeExternal cli
3434

3535
mux := genericmux.NewPathRecorderMux("master-healthz")
3636

37-
healthz.InstallHandler(mux, healthz.PingHealthz)
37+
healthz.InstallHandler(mux, healthz.PingHealthz, healthz.LogHealthz)
3838
initReadinessCheckRoute(mux, "/healthz/ready", func() bool { return true })
3939
genericroutes.Profiling{}.Install(mux)
4040
genericroutes.MetricsWithReset{}.Install(mux)

test/integration/master_routes_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ var expectedIndex = []string{
106106
"/healthz",
107107
"/healthz/autoregister-completion",
108108
"/healthz/etcd",
109+
"/healthz/log",
109110
"/healthz/ping",
110111
"/healthz/poststarthook/apiservice-openapi-controller",
111112
"/healthz/poststarthook/apiservice-registration-controller",

vendor/k8s.io/kubernetes/pkg/kubelet/server/server.go

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/config.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/config_test.go

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/k8s.io/kubernetes/staging/src/k8s.io/apiserver/pkg/server/healthz/healthz.go

+24
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)