From 150232325ec68cc5b0c873146e3fb6fd56049d1a Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Mon, 10 Jun 2019 20:26:38 -0700
Subject: [PATCH] Use v2 config.

Signed-off-by: Lantao Liu <lantaol@google.com>
---
 cluster/gce/configure.sh | 21 +++++++++++----------
 pkg/client/client.go     | 10 +++++++++-
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/cluster/gce/configure.sh b/cluster/gce/configure.sh
index 081d30f59..9deaa2f23 100755
--- a/cluster/gce/configure.sh
+++ b/cluster/gce/configure.sh
@@ -158,29 +158,30 @@ fi
 log_level="${CONTAINERD_LOG_LEVEL:-"info"}"
 max_container_log_line="${CONTAINERD_MAX_CONTAINER_LOG_LINE:-16384}"
 cat > ${config_path} <<EOF
+version = 2
 # Kubernetes requires the cri plugin.
-required_plugins = ["cri"]
+required_plugins = ["io.containerd.grpc.v1.cri"]
 # Kubernetes doesn't use containerd restart manager.
-disabled_plugins = ["restart"]
+disabled_plugins = ["io.containerd.internal.v1.restart"]
 
 [debug]
   level = "${log_level}"
 
-[plugins.cri]
+[plugins."io.containerd.grpc.v1.cri"]
   stream_server_address = "127.0.0.1"
   stream_server_port = "0"
   max_container_log_line_size = ${max_container_log_line}
-[plugins.cri.cni]
+[plugins."io.containerd.grpc.v1.cri".cni]
   bin_dir = "${cni_bin_dir}"
   conf_dir = "/etc/cni/net.d"
   conf_template = "${cni_template_path}"
-[plugins.cri.registry.mirrors."docker.io"]
+[plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"]
   endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"]
-[plugins.cri.containerd]
+[plugins."io.containerd.grpc.v1.cri".containerd]
   default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}"
-[plugins.cri.containerd.runtimes.runc]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
   runtime_type = "io.containerd.runc.v2"
-[plugins.cri.containerd.runtimes.runc.options]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
   BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc"
 EOF
 chmod 644 "${config_path}"
@@ -189,10 +190,10 @@ chmod 644 "${config_path}"
 containerd_extra_runtime_handler=${CONTAINERD_EXTRA_RUNTIME_HANDLER:-""}
 if [[ -n "${containerd_extra_runtime_handler}" ]]; then
   cat >> ${config_path} <<EOF
-[plugins.cri.containerd.runtimes.${containerd_extra_runtime_handler}]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.${containerd_extra_runtime_handler}]
   runtime_type = "${CONTAINERD_EXTRA_RUNTIME_TYPE:-io.containerd.runc.v1}"
 
-[plugins.cri.containerd.runtimes.${containerd_extra_runtime_handler}.options]
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.${containerd_extra_runtime_handler}.options]
 ${CONTAINERD_EXTRA_RUNTIME_OPTIONS:-}
 EOF
 fi
diff --git a/pkg/client/client.go b/pkg/client/client.go
index 83d605ff9..ab1a0fc55 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -18,6 +18,8 @@ package client
 
 import (
 	"context"
+	"net"
+	"time"
 
 	"github.com/pkg/errors"
 	"google.golang.org/grpc"
@@ -36,7 +38,13 @@ func NewCRIPluginClient(ctx context.Context, endpoint string) (api.CRIPluginServ
 	conn, err := grpc.DialContext(ctx, addr,
 		grpc.WithBlock(),
 		grpc.WithInsecure(),
-		grpc.WithDialer(dialer),
+		grpc.WithContextDialer(
+			func(ctx context.Context, addr string) (net.Conn, error) {
+				if deadline, ok := ctx.Deadline(); ok {
+					return dialer(addr, time.Until(deadline))
+				}
+				return dialer(addr, 0)
+			}),
 	)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to dial")