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>
This commit is contained in:
Tim Allclair 2019-02-28 14:13:20 -08:00
parent fbce57903c
commit d7c5b246c6

View File

@ -181,6 +181,16 @@ disabled_plugins = ["restart"]
EOF EOF
chmod 644 "${config_path}" 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" > \ echo "export PATH=${CONTAINERD_HOME}/usr/local/bin/:${CONTAINERD_HOME}/usr/local/sbin/:\$PATH" > \
/etc/profile.d/containerd_env.sh /etc/profile.d/containerd_env.sh