github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 12:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1050 from dsyer/v2cri

Browse Source 
Detect v2 schema and use correct long form of cri plugin
This commit is contained in:
James O. D. Hunt
2020-06-01 09:02:59 +01:00
committed by GitHub
parent d1b4873bf5 e2d08dcf43
commit f7d8fc37b4
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kata-deploy/scripts/kata-deploy.sh
View File

@@ -151,7 +151,11 @@ function configure_containerd_runtime() {
runtime+="-$1"
configuration+="-$1"
fi
local runtime_table="plugins.cri.containerd.runtimes.$runtime"
local pluginid=cri
if grep -q "version = 2\>" $containerd_conf_file; then
pluginid=\"io.containerd.grpc.v1.cri\"
fi
local runtime_table="plugins.${pluginid}.containerd.runtimes.$runtime"
local runtime_type="io.containerd.$runtime.v2"
local options_table="$runtime_table.options"
local config_path="/opt/kata/share/defaults/kata-containers/$configuration.toml"