github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Add runtime cgroup and fix a cli panic.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-01-25 22:01:05 +00:00 committed by Derek McGowan
parent 680e21c430
commit be72f47ec9
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/gce/cloud-init/master.yaml
View File

@ -31,6 +31,9 @@ write_files:
# installed by cloud-init # installed by cloud-init
oom_score = -999 oom_score = -999
[cgroup]
path = "/runtime"
[plugins.linux] [plugins.linux]
shim = "/home/cri-containerd/usr/local/bin/containerd-shim" shim = "/home/cri-containerd/usr/local/bin/containerd-shim"
runtime = "/home/cri-containerd/usr/local/sbin/runc" runtime = "/home/cri-containerd/usr/local/sbin/runc"
@ -84,7 +87,8 @@ write_files:
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--log-level=debug \ --log-level=debug \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \ --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] [Install]
WantedBy=cri-containerd.target WantedBy=cri-containerd.target

6
contrib/gce/cloud-init/node.yaml
View File

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