Merge pull request #46 from ijc/cgroups

Put system and runtime containers into cgroups.

Author: ijc

pkg/kubelet/kubelet.sh

@@ -75,4 +75,6 @@ exec kubelet --kubeconfig=/etc/kubernetes/kubelet.conf \
 	      --cni-conf-dir=/etc/cni/net.d \
 	      --cni-bin-dir=/opt/cni/bin \
 	      --cadvisor-port=0 \
+	      --kube-reserved-cgroup=podruntime \
+	      --system-reserved-cgroup=systemreserved \
 	      $KUBELET_ARGS $@

yml/cri-containerd.yml

@@ -1,7 +1,7 @@
 services:
   - name: cri-containerd
     image: linuxkit/cri-containerd:35f4761216380fe80a120ba7fa2d52545847cc13
-    cgroupsPath: podruntime/runtime
+    cgroupsPath: podruntime/cri-containerd
 files:
   - path: /etc/kubelet.sh.conf
     contents: |

yml/docker-master.yml

@@ -1,3 +1,4 @@
 services:
   - name: kubernetes-docker-image-cache-control-plane
     image: linuxkit/kubernetes-docker-image-cache-control-plane:3606d4714909c0916f68f2ac96fc728c4d9de316
+    cgroupsPath: podruntime/control-cache

yml/docker.yml

@@ -22,8 +22,10 @@ services:
     command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
     runtime:
       mkdir: ["/var/lib/kubeadm", "/var/lib/cni/conf", "/var/lib/cni/bin", "/var/lib/kubelet-plugins"]
+    cgroupsPath: podruntime/docker
   - name: kubernetes-docker-image-cache-common
     image: linuxkit/kubernetes-docker-image-cache-common:434f337a5338776f67ab34e2327489c1368f2559
+    cgroupsPath: podruntime/common-cache
 files:
   - path: /etc/kubelet.sh.conf
     contents: ""

yml/kube.yml

@@ -29,14 +29,23 @@ services:
     image: linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f
     env:
      - INSECURE=true
+    cgroupsPath: systemreserved/getty
   - name: rngd
     image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd
+    cgroupsPath: systemreserved/rngd
   - name: ntpd
     image: linuxkit/openntpd:536e5947607c9e6a6771957c2ff817230cba0d3c
+    cgroupsPath: systemreserved/ntpd
   - name: sshd
     image: linuxkit/sshd:ac5e8364e2e9aa8717a3295c51eb60b8c57373d5
+    cgroupsPath: systemreserved/sshd
   - name: kubelet
-    image: linuxkit/kubelet:5d0603711e4154d03c6f76f731ffd515bcacd60b
+    image: linuxkit/kubelet:e9b7f3fda7b13331fc5ec07570174df8e8d470ad
+    cgroupsPath: podruntime/kubelet
+    runtime:
+      cgroups:
+        - systemreserved
+        - podruntime
 files:
   - path: etc/linuxkit.yml
     metadata: yaml