Unverified Commit fe1c052e authored by Johnny Bergström's avatar Johnny Bergström Committed by Matthew Fisher

Bump client side grpc max msg size

Set it to match the server side, or the default limit
of 4MB will still apply when upgrading charts.

Fixes #3512

(cherry picked from commit 98e5006e)
parent 6d6c41eb
...@@ -30,6 +30,10 @@ import ( ...@@ -30,6 +30,10 @@ import (
rls "k8s.io/helm/pkg/proto/hapi/services" rls "k8s.io/helm/pkg/proto/hapi/services"
) )
// maxMsgSize use 20MB as the default message size limit.
// grpc library default is 4MB
const maxMsgSize = 1024 * 1024 * 20
// Client manages client side of the Helm-Tiller protocol. // Client manages client side of the Helm-Tiller protocol.
type Client struct { type Client struct {
opts options opts options
...@@ -310,6 +314,7 @@ func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error) ...@@ -310,6 +314,7 @@ func (h *Client) connect(ctx context.Context) (conn *grpc.ClientConn, err error)
// getting closed by upstreams // getting closed by upstreams
Time: time.Duration(30) * time.Second, Time: time.Duration(30) * time.Second,
}), }),
grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(maxMsgSize)),
} }
switch { switch {
case h.opts.useTLS: case h.opts.useTLS:
......
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
// maxMsgSize use 20MB as the default message size limit. // maxMsgSize use 20MB as the default message size limit.
// grpc library default is 4MB // grpc library default is 4MB
var maxMsgSize = 1024 * 1024 * 20 const maxMsgSize = 1024 * 1024 * 20
// DefaultServerOpts returns the set of default grpc ServerOption's that Tiller requires. // DefaultServerOpts returns the set of default grpc ServerOption's that Tiller requires.
func DefaultServerOpts() []grpc.ServerOption { func DefaultServerOpts() []grpc.ServerOption {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment