From be72f47ec93361e6975a342317193d8b75e9a3d4 Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Thu, 25 Jan 2018 22:01:05 +0000 Subject: [PATCH] Add runtime cgroup and fix a cli panic. Signed-off-by: Lantao Liu --- contrib/gce/cloud-init/master.yaml | 6 +++++- contrib/gce/cloud-init/node.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contrib/gce/cloud-init/master.yaml b/contrib/gce/cloud-init/master.yaml index 09505defd..810bc82e4 100644 --- a/contrib/gce/cloud-init/master.yaml +++ b/contrib/gce/cloud-init/master.yaml @@ -31,6 +31,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" @@ -84,7 +87,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 diff --git a/contrib/gce/cloud-init/node.yaml b/contrib/gce/cloud-init/node.yaml index ac04e4f72..76e290a60 100644 --- a/contrib/gce/cloud-init/node.yaml +++ b/contrib/gce/cloud-init/node.yaml @@ -34,6 +34,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" @@ -87,7 +90,8 @@ write_files: ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ --log-level=debug \ --network-bin-dir=/home/kubernetes/bin \ - --network-conf-dir=/etc/cni/net.d + --network-conf-dir=/etc/cni/net.d \ + --cgroup-path=/runtime [Install] WantedBy=cri-containerd.target