From e6e272e740a3f4b15bd3cd1ede006a31d54b3dc4 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Wed, 3 Apr 2019 18:47:25 -0700 Subject: [PATCH] Enable runc.v2 as the default runtime in test. Signed-off-by: Lantao Liu --- contrib/gce/configure.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh index b91309c54..3a84f7f99 100755 --- a/contrib/gce/configure.sh +++ b/contrib/gce/configure.sh @@ -164,10 +164,6 @@ disabled_plugins = ["restart"] [debug] level = "${log_level}" -[plugins.linux] - shim = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim" - runtime = "${CONTAINERD_HOME}/usr/local/sbin/runc" - [plugins.cri] stream_server_address = "127.0.0.1" stream_server_port = "0" @@ -178,6 +174,10 @@ disabled_plugins = ["restart"] conf_template = "${cni_template_path}" [plugins.cri.registry.mirrors."docker.io"] endpoint = ["https://mirror.gcr.io","https://registry-1.docker.io"] +[plugins.cri.containerd.default_runtime] + runtime_type = "io.containerd.runc.v2" +[plugins.cri.containerd.default_runtime.options] + BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc" EOF chmod 644 "${config_path}"