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 <bin@hyper.sh>
(cherry picked from commit b0e4618e84)
This commit is contained in:
bin 2021-04-06 17:42:49 +08:00 committed by Fabiano Fidêncio
parent f5adc4c114
commit 6586f3b725

View File

@ -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. 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 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 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 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 $ cat /etc/containerd/config
.... ....
[plugins.cri.containerd.runtimes.kata] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.kata]
runtime_type = "io.containerd.runc.v1" runtime_type = "io.containerd.kata.v2"
pod_annotations = ["io.katacontainers.*"] pod_annotations = ["io.katacontainers.*"]
[plugins.cri.containerd.runtimes.kata.options]
BinaryName = "/usr/bin/kata-runtime"
.... ....
``` ```