From 474c79bd52b90cdd93da72bee9ca1d72e839797c Mon Sep 17 00:00:00 2001
From: Tim Allclair <tallclair@google.com>
Date: Thu, 28 Feb 2019 14:13:20 -0800
Subject: [PATCH] Expose vars to configure an additional runtime handler

Expose environment variables in the GCE containerd configuration
script for configuring an additional runtime handler. This unblocks
E2E testing of custom runtime handlers.

Signed-off-by: Tim Allclair <tallclair@google.com>
---
 contrib/gce/configure.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/contrib/gce/configure.sh b/contrib/gce/configure.sh
index 8b7cac3fb..9ed09da93 100755
--- a/contrib/gce/configure.sh
+++ b/contrib/gce/configure.sh
@@ -181,6 +181,16 @@ disabled_plugins = ["restart"]
 EOF
 chmod 644 "${config_path}"
 
+if [[ -n "${CONTAINERD_EXTRA_RUNTIME_HANDLER}" ]]; then
+  cat >> ${config_path} <<EOF
+[plugins.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]
+${CONTAINERD_EXTRA_RUNTIME_OPTIONS:-}
+EOF
+fi
+
 echo "export PATH=${CONTAINERD_HOME}/usr/local/bin/:${CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \
   /etc/profile.d/containerd_env.sh