Merge pull request #50796 from yguo0905/hc

Automatic merge from submit-queue (batch tested with PRs 50563, 50698, 50796) Disable Docker's health check until we officially support it Ref: https://github.com/kubernetes/kubernetes/issues/50703 Tested locally. Without this PR: ``` CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES afdd796ddddc gcr.io/ygg-gke-dev/nginx-healthcheck "nginx -g 'daemon ..." 5 minutes ago Up 5 minutes (healthy) k8s_test-container_test-pod_default_8a1ad225-82bf-11e7-becb-480fcf514648_0 ``` With this PR: ``` e3fb2437555f gcr.io/ygg-gke-dev/nginx-healthcheck "nginx -g 'daemon ..." 10 seconds ago Up 9 seconds k8s_test-container_test-pod_default_de82e83c-82c0-11e7-b3fc-480fcf514648_0 ``` **Release note**: ``` Disable Docker's health check until we officially support it. ``` /assign @yujuhong /assign @dchen1107

Merge pull request #50796 from yguo0905/hc
e86f43bc · Kubernetes Submit Queue · GitHub · 9d302ecf · fe06c7ec · e86f43bc
Commit e86f43bc authored Aug 17, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

docker_container.go pkg/kubelet/dockershim/docker_container.go +5 -0

No files found.
--- a/pkg/kubelet/dockershim/docker_container.go
+++ b/pkg/kubelet/dockershim/docker_container.go
@@ -131,6 +131,11 @@ func (ds *dockerService) CreateContainer(podSandboxID string, config *runtimeapi
 			OpenStdin: config.Stdin,
 			StdinOnce: config.StdinOnce,
 			Tty:       config.Tty,
+			// Disable Docker's health check until we officially support it
+			// (https://github.com/kubernetes/kubernetes/issues/25829).
+			Healthcheck: &dockercontainer.HealthConfig{
+				Test: []string{"NONE"},
+			},
 		},
 		HostConfig: &dockercontainer.HostConfig{
 			Binds: generateMountBindings(config.GetMounts()),