github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 07:22:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4609 from fidencio/topic/kata-deploy-simplify-config-path-handling

Browse Source 
packaging: Simplify config path handling
This commit is contained in:
Fabiano Fidêncio 2022-07-11 23:48:54 +02:00 committed by GitHub
commit cda1919a0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,10 +98,7 @@ function configure_different_shims_base() {
fi fi
fi fi
cat << EOF | tee "$shim_file" ln -sf /opt/kata/bin/containerd-shim-kata-v2 "${shim_file}"
#!/usr/bin/env bash
KATA_CONF_FILE=/opt/kata/share/defaults/kata-containers/configuration-${shim}.toml /opt/kata/bin/containerd-shim-kata-v2 "\$@"
EOF
chmod +x "$shim_file" chmod +x "$shim_file"
if [ "${shim}" == "${default_shim}" ]; then if [ "${shim}" == "${default_shim}" ]; then
@ -129,12 +126,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 +143,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
} }