Fix ctr cri timeout.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-06-05 00:04:47 +00:00
parent ecf8d99d06
commit 0faff1c22f
3 changed files with 9 additions and 9 deletions

View File

@@ -18,7 +18,6 @@ package client
import (
"context"
"time"
"github.com/pkg/errors"
"google.golang.org/grpc"
@@ -29,13 +28,11 @@ import (
// NewCRIPluginClient creates grpc client of cri plugin
// TODO(random-liu): Wrap grpc functions.
func NewCRIPluginClient(endpoint string, timeout time.Duration) (api.CRIPluginServiceClient, error) {
func NewCRIPluginClient(ctx context.Context, endpoint string) (api.CRIPluginServiceClient, error) {
addr, dialer, err := util.GetAddressAndDialer(endpoint)
if err != nil {
return nil, errors.Wrap(err, "failed to get dialer")
}
ctx, cancel := context.WithTimeout(context.Background(), timeout)
defer cancel()
conn, err := grpc.DialContext(ctx, addr,
grpc.WithBlock(),
grpc.WithInsecure(),