From 6586f3b7257d66843beeddc0e912aeab66d6bc39 Mon Sep 17 00:00:00 2001 From: bin Date: Tue, 6 Apr 2021 17:42:49 +0800 Subject: [PATCH] docs: update configuration for passing annotations in conatinerd Using "io.containerd.kata.v2" instead of deprecated "io.containerd.runc.v1". Fixes: #1629 Signed-off-by: bin (cherry picked from commit b0e4618e84396eeb4159102efb62a7c64d1151ee) --- docs/how-to/how-to-set-sandbox-config-kata.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/how-to/how-to-set-sandbox-config-kata.md b/docs/how-to/how-to-set-sandbox-config-kata.md index 4d8d1d8457..43e8d4df1f 100644 --- a/docs/how-to/how-to-set-sandbox-config-kata.md +++ b/docs/how-to/how-to-set-sandbox-config-kata.md @@ -80,6 +80,8 @@ There are several kinds of Kata configurations and they are listed below. In case of CRI-O, all annotations specified in the pod spec are passed down to Kata. +# containerd Configuration + For containerd, annotations specified in the pod spec are passed down to Kata starting with version `1.3.0` of containerd. Additionally, extra configuration is needed for containerd, by providing a `pod_annotations` field in the containerd config @@ -92,11 +94,9 @@ for passing annotations to Kata from containerd: $ cat /etc/containerd/config .... -[plugins.cri.containerd.runtimes.kata] - runtime_type = "io.containerd.runc.v1" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata] + runtime_type = "io.containerd.kata.v2" pod_annotations = ["io.katacontainers.*"] - [plugins.cri.containerd.runtimes.kata.options] - BinaryName = "/usr/bin/kata-runtime" .... ```