Merge pull request #60068 from wojtek-t/ssl_key_longer_timeout

Automatic merge from submit-queue (batch tested with PRs 60148, 60022, 59125, 60068, 60154). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Increase allowed lag for ssh key sync loop for tunneler Part of https://github.com/kubernetes/kubernetes/issues/59347

Merge pull request #60068 from wojtek-t/ssl_key_longer_timeout
c0026e50 · Kubernetes Submit Queue · GitHub · 30a7bad8 · adf22e22 · c0026e50
Unverified Commit c0026e50 authored Feb 21, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

ssh.go pkg/master/tunneler/ssh.go +6 -1

No files found.
--- a/pkg/master/tunneler/ssh.go
+++ b/pkg/master/tunneler/ssh.go
@@ -60,7 +60,12 @@ func TunnelSyncHealthChecker(tunneler Tunneler) func(req *http.Request) error {
 			return fmt.Errorf("Tunnel sync is taking too long: %d", lag)
 		}
 		sshKeyLag := tunneler.SecondsSinceSSHKeySync()
-		if sshKeyLag > 600 {
+		// Since we are syncing ssh-keys every 5 minutes, the allowed
+		// lag since last sync should be more than 2x higher than that
+		// to allow for single failure, which can always happen.
+		// For now set it to 3x, which is 15 minutes.
+		// For more details see: http://pr.k8s.io/59347
+		if sshKeyLag > 900 {
 			return fmt.Errorf("SSHKey sync is taking too long: %d", sshKeyLag)
 		}
 		return nil