Merge pull request #30641 from Random-Liu/fix-liveness-check-flake

Automatic merge from submit-queue Add back the original liveness check timeout. Fixes https://github.com/kubernetes/kubernetes/issues/30342. Fixes https://github.com/kubernetes/kubernetes/issues/30335. When I moved the test into common directory, I removed the original 10s timeout - https://github.com/kubernetes/kubernetes/pull/29814/commits/0362789283d06c31b42e94ac7e81c1ba981a0b87#diff-0f856ff011970dca55a2cd916b9ddcf0L1128. It turns out that the default 1s timeout is not enough. In all the flake, the probe request is cancelled on the kubelet side. This PR added back a 5s timeout to eliminate the flake. Mark P0 to match the corresponding issue. @freehan /cc @matchstick :)

Merge pull request #30641 from Random-Liu/fix-liveness-check-flake
5c1d7a7d · Kubernetes Submit Queue · GitHub · f236df50 · 2fce9727 · 5c1d7a7d
Commit 5c1d7a7d authored Aug 16, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 16, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

container_probe.go test/e2e/common/container_probe.go +1 -0

No files found.
--- a/test/e2e/common/container_probe.go
+++ b/test/e2e/common/container_probe.go
@@ -223,6 +223,7 @@ var _ = framework.KubeDescribe("Probing container", func() {
 								},
 							},
 							InitialDelaySeconds: 15,
+							TimeoutSeconds:      5,
 							FailureThreshold:    1,
 						},
 					},