github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-31 09:26:52 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: Pass the config path to CRI-O

Browse Source 
As we're already doing for containerd, let's also pass the configuration
path to CRI-O, as all the supported CRI-O versions do support this
configuration option.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio
2022-07-08 12:33:30 +02:00
parent f36bc8bc52
commit 386a523a05
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/packaging/kata-deploy/scripts/kata-deploy.sh
View File

@@ -129,12 +129,15 @@ function cleanup_different_shims_base() {
function configure_crio_runtime() { function configure_crio_runtime() {
local runtime="kata" local runtime="kata"
local configuration="configuration"
if [ -n "${1-}" ]; then if [ -n "${1-}" ]; then
runtime+="-$1" runtime+="-$1"
configuration+="-$1"
fi fi
local kata_path="/usr/local/bin/containerd-shim-${runtime}-v2" local kata_path="/usr/local/bin/containerd-shim-${runtime}-v2"
local kata_conf="crio.runtime.runtimes.${runtime}" local kata_conf="crio.runtime.runtimes.${runtime}"
local kata_config_path="/opt/kata/share/defaults/kata-containers/$configuration.toml"
cat <<EOF | tee -a "$crio_drop_in_conf_file" cat <<EOF | tee -a "$crio_drop_in_conf_file"
@@ -143,6 +146,7 @@ function configure_crio_runtime() {
runtime_path = "${kata_path}" runtime_path = "${kata_path}"
runtime_type = "vm" runtime_type = "vm"
runtime_root = "/run/vc" runtime_root = "/run/vc"
runtime_config_path = "${kata_config_path}"
privileged_without_host_devices = true privileged_without_host_devices = true
EOF EOF
} }