Add runtime cgroup and fix a cli panic.

Random-Liu · estesp · commit 5ad7db207081 · 2020-10-01T16:38:04.000-04:00
Signed-off-by: Lantao Liu &lt;lantaol@google.com&gt;
diff --git 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
@@ -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
