From 87bd84a7bb3e3933c466a40a7f9a197eadb404f7 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Mon, 8 Apr 2019 16:39:28 -0700 Subject: [PATCH] Add DefaultRuntimeName option. Signed-off-by: Lantao Liu --- contrib/gce/configure.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh index b616c25a6..d069dc446 100755 --- a/contrib/gce/configure.sh +++ b/contrib/gce/configure.sh @@ -176,9 +176,11 @@ 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] +[plugins.cri.containerd] + default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}" +[plugins.cri.containerd.runtimes.runc] runtime_type = "io.containerd.runc.v1" -[plugins.cri.containerd.default_runtime.options] +[plugins.cri.containerd.runtimes.runc.options] BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc" EOF chmod 644 "${config_path}"