From 3cecb369029a765237ff9c444dc95ed58746a994 Mon Sep 17 00:00:00 2001 From: Eric Ernst Date: Thu, 7 Mar 2019 14:51:32 -0800 Subject: [PATCH] kata-deploy: containerd-v2: specify configuration file for runtime Eventually containerd will allow us to provide an argument for a given runtime handler, but in the meantime, let's use bash to provide indirection to specify the appropriate configuration file. Only QEMU is handled until we have a block based snapshotter available. Signed-off-by: Eric Ernst --- kata-deploy/scripts/kata-deploy.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/kata-deploy/scripts/kata-deploy.sh b/kata-deploy/scripts/kata-deploy.sh index c859e1fcf..08ac60839 100755 --- a/kata-deploy/scripts/kata-deploy.sh +++ b/kata-deploy/scripts/kata-deploy.sh @@ -12,6 +12,7 @@ crio_conf_file="/etc/crio/crio.conf" crio_conf_file_backup="${crio_conf_file}.bak" containerd_conf_file="/etc/containerd/config.toml" containerd_conf_file_backup="${containerd_conf_file}.bak" + shim_binary="containerd-shim-kata-v2" shim_file="/usr/local/bin/${shim_binary}" shim_backup="/usr/local/bin/${shim_binary}.bak" @@ -94,6 +95,7 @@ function configure_containerd() { runtime_type = "io.containerd.kata.v2" EOT + #Currently containerd has an assumption on the location of the shimv2 implementation #Until support is added (see https://github.com/containerd/containerd/issues/3073), #create a link in /usr/local/bin/ to the v2-shim implementation in /opt/kata/bin. @@ -106,7 +108,13 @@ EOT fi fi - ln -s /opt/kata/bin/${shim_binary} ${shim_file} + mkdir -p /usr/local/bin + + cat << EOT | tee "$shim_file" +#!/bin/bash +KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration.toml /opt/kata/bin/${shim_binary} \$@ +EOT + chmod +x $shim_file }