From 588f7a8443384dc7c83d8d2d802c970af3314f02 Mon Sep 17 00:00:00 2001 From: Ben Langfeld Date: Fri, 9 Feb 2018 10:31:19 -0200 Subject: [PATCH] Tiller should only enforce what we expect from Helm https://github.com/kubernetes/helm/pull/3183 added a keepalive to the Helm client of 30s period, while Tiller was never configured to permit this, keeping the default minimum keepalive period of 5 minutes, disconnecting any clients which ping more regularly than this. This commit enforces a minimum that is lower than what Helm is configured for, preventing these disconnections, and thus fixes #3409. --- cmd/tiller/tiller.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index 96eeddacb..185bf4b6c 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -161,6 +161,9 @@ func start() { MaxConnectionIdle: 10 * time.Minute, // If needed, we can configure the max connection age })) + opts = append(opts, grpc.KeepaliveEnforcementPolicy(keepalive.EnforcementPolicy{ + MinTime: time.Duration(20) * time.Second, // For compatibility with the client keepalive.ClientParameters + })) } rootServer = tiller.NewServer(opts...)