mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-22 19:23:24 +00:00
Merge pull request #761 from chavafg/topic/cri-containerd-virtiofs-config
kata-deploy: Add qemu-virtiofs to containerd configuration
This commit is contained in:
commit
826e279db3
@ -14,9 +14,10 @@ containerd_conf_file="/etc/containerd/config.toml"
|
|||||||
containerd_conf_file_backup="${containerd_conf_file}.bak"
|
containerd_conf_file_backup="${containerd_conf_file}.bak"
|
||||||
|
|
||||||
shims=(
|
shims=(
|
||||||
"qemu"
|
|
||||||
"nemu"
|
|
||||||
"fc"
|
"fc"
|
||||||
|
"nemu"
|
||||||
|
"qemu"
|
||||||
|
"qemu-virtiofs"
|
||||||
)
|
)
|
||||||
|
|
||||||
# If we fail for any reason a message will be displayed
|
# If we fail for any reason a message will be displayed
|
||||||
@ -93,13 +94,12 @@ EOT
|
|||||||
else
|
else
|
||||||
cat <<EOT | tee -a "$crio_conf_file"
|
cat <<EOT | tee -a "$crio_conf_file"
|
||||||
|
|
||||||
# Path to the Kata Containers runtime binary that uses the QEMU hypervisor.
|
# Path to the Kata Containers runtime binary that uses the QEMU hypervisor with virtiofs support.
|
||||||
[$kata_qemu_conf]
|
[$kata_qemu_conf]
|
||||||
runtime_path = "${kata_qemu_virtiofs_path}"
|
runtime_path = "${kata_qemu_virtiofs_path}"
|
||||||
EOT
|
EOT
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# add kata-nemu config
|
# add kata-nemu config
|
||||||
if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
|
if grep -q "^\[$kata_nemu_conf\]" $crio_conf_file; then
|
||||||
echo "Configuration exists $kata_nemu_conf, overwriting"
|
echo "Configuration exists $kata_nemu_conf, overwriting"
|
||||||
@ -160,6 +160,10 @@ function configure_containerd() {
|
|||||||
runtime_type = "io.containerd.kata-qemu.v2"
|
runtime_type = "io.containerd.kata-qemu.v2"
|
||||||
[plugins.cri.containerd.runtimes.kata-qemu.options]
|
[plugins.cri.containerd.runtimes.kata-qemu.options]
|
||||||
ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
|
ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu.toml"
|
||||||
|
[plugins.cri.containerd.runtimes.kata-qemu-virtiofs]
|
||||||
|
runtime_type = "io.containerd.kata-qemu-virtiofs.v2"
|
||||||
|
[plugins.cri.containerd.runtimes.kata-qemu-virtiofs.options]
|
||||||
|
ConfigPath = "/opt/kata/share/defaults/kata-containers/configuration-qemu-virtiofs.toml"
|
||||||
[plugins.cri.containerd.runtimes.kata-nemu]
|
[plugins.cri.containerd.runtimes.kata-nemu]
|
||||||
runtime_type = "io.containerd.kata-nemu.v2"
|
runtime_type = "io.containerd.kata-nemu.v2"
|
||||||
[plugins.cri.containerd.runtimes.kata-nemu.options]
|
[plugins.cri.containerd.runtimes.kata-nemu.options]
|
||||||
|
Loading…
Reference in New Issue
Block a user