Merge pull request #33859 from luxas/not_so_aggressve_probes

Automatic merge from submit-queue Do not probe so aggressively which may lead to unnecessary restarts @errordeveloper @mikedanese PTAL I came across a case where etcd restarted about 5-10 times because the load was very high on the machine. The load seems to have lead to that the `etcd` container occasionally didn't respond to the probe, which caused many restart and made the whole thing even worse. Maybe we should remove the etcd probe totally? I don't know, what do you think? This is at least a try to loosen the limits here...

Merge pull request #33859 from luxas/not_so_aggressve_probes
64d2b12d · Kubernetes Submit Queue · GitHub · 8d9642e2 · 60274778 · 64d2b12d
Commit 64d2b12d authored Oct 03, 2016 by Kubernetes Submit Queue Committed by GitHub Oct 03, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

manifests.go cmd/kubeadm/app/master/manifests.go +1 -0

No files found.
--- a/cmd/kubeadm/app/master/manifests.go
+++ b/cmd/kubeadm/app/master/manifests.go
@@ -195,6 +195,7 @@ func componentProbe(port int, path string) *api.Probe {
 		},
 		InitialDelaySeconds: 15,
 		TimeoutSeconds:      15,
+		FailureThreshold:    8,
 	}
 }