github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-10-20 11:28:42 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: detect v1 schema and use correct long form of cri

Browse Source 
CRI has a v2 schema that seems to be the default in a lot of
containerd installations. It uses a "long" form for the plugin
id in the TOML config file.

Fixes #881

Signed-off-by: Dave Syer <dsyer@pivotal.io>
This commit is contained in:
Dave Syer
2020-05-14 15:28:00 +01:00
parent 3d53c5d231
commit e2d08dcf43
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"