From 3b22ecd53b2df89e1d0dc625c7fd569450ef13d8 Mon Sep 17 00:00:00 2001
From: Ben Langfeld <ben@langfeld.me>
Date: Fri, 9 Feb 2018 11:11:05 -0200
Subject: [PATCH] Keepalive config should be independent of TLS
---
cmd/tiller/tiller.go | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go
index 185bf4b6c..e0c10cb29 100644
--- a/cmd/tiller/tiller.go
+++ b/cmd/tiller/tiller.go
@@ -157,15 +157,16 @@ func start() {
logger.Fatalf("Could not create server TLS configuration: %v", err)
}
opts = append(opts, grpc.Creds(credentials.NewTLS(cfg)))
- opts = append(opts, grpc.KeepaliveParams(keepalive.ServerParameters{
- 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
- }))
}
+ opts = append(opts, grpc.KeepaliveParams(keepalive.ServerParameters{
+ 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...)
lstn, err := net.Listen("tcp", *grpcAddr)
--
GitLab