Merge pull request #3129 from thomastaylor312/fix/tiller_connections

Fix tiller idle connections
pull/3212/head
Matthew Fisher 7 years ago committed by GitHub
commit 06be9d7800
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -28,10 +28,12 @@ import (
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
"time"
goprom "github.com/grpc-ecosystem/go-grpc-prometheus" goprom "github.com/grpc-ecosystem/go-grpc-prometheus"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/keepalive"
"k8s.io/helm/pkg/kube" "k8s.io/helm/pkg/kube"
"k8s.io/helm/pkg/proto/hapi/services" "k8s.io/helm/pkg/proto/hapi/services"
@ -155,6 +157,10 @@ func start() {
logger.Fatalf("Could not create server TLS configuration: %v", err) logger.Fatalf("Could not create server TLS configuration: %v", err)
} }
opts = append(opts, grpc.Creds(credentials.NewTLS(cfg))) 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
}))
} }
rootServer = tiller.NewServer(opts...) rootServer = tiller.NewServer(opts...)

Loading…
Cancel
Save