Add runtime cgroup and fix a cli panic.

Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu
2018-01-25 22:01:05 +00:00
parent 11042a4141
commit e7f2a74a84
8 changed files with 59 additions and 52 deletions

View File

@@ -30,6 +30,9 @@ write_files:
# installed by cloud-init
oom_score = -999
[cgroup]
path = "/runtime"
[plugins.linux]
shim = "/home/cri-containerd/usr/local/bin/containerd-shim"
runtime = "/home/cri-containerd/usr/local/sbin/runc"
@@ -81,7 +84,8 @@ write_files:
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--log-level=debug \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \
--network-conf-dir=/home/cri-containerd/etc/cni/net.d
--network-conf-dir=/home/cri-containerd/etc/cni/net.d \
--cgroup-path=/runtime
[Install]
WantedBy=cri-containerd.target