Skip to content

Commit fb971dc

Browse files
Merge pull request #14 from justincormack/cgroups
Put containers in the cgroups that Kubernetes recommends
2 parents 02141a5 + 662d3d4 commit fb971dc

File tree

4 files changed

+9
-0
lines changed

4 files changed

+9
-0
lines changed

yml/cri-containerd.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
services:
22
- name: cri-containerd
33
image: linuxkit/cri-containerd:9c24ac6197ee725844c4b004e26c66f750309e95
4+
cgroupsPath: podruntime/runtime
45
files:
56
- path: /etc/kubelet.sh.conf
67
contents: |

yml/docker-master.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
services:
22
- name: kubernetes-docker-image-cache-control-plane
33
image: linuxkit/kubernetes-docker-image-cache-control-plane:dc76dd17fabc18fb035d2c6ca54c656b94a0f489
4+
cgroupsPath: podruntime/runtime

yml/docker.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ services:
2222
command: ["/usr/local/bin/docker-init", "/usr/local/bin/dockerd"]
2323
runtime:
2424
mkdir: ["/var/lib/kubeadm", "/var/lib/cni/etc", "/var/lib/cni/opt", "/var/lib/kubelet-plugins"]
25+
cgroupsPath: podruntime/runtime
2526
- name: kubernetes-docker-image-cache-common
2627
image: linuxkit/kubernetes-docker-image-cache-common:dc76dd17fabc18fb035d2c6ca54c656b94a0f489
28+
cgroupsPath: podruntime/runtime
2729
files:
2830
- path: /etc/kubelet.sh.conf
2931
contents: ""

yml/kube.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,19 @@ services:
2929
image: linuxkit/getty:6af22c32c98536a79230eef000e9abd06b037faa
3030
env:
3131
- INSECURE=true
32+
cgroupsPath: systemreserved/getty
3233
- name: rngd
3334
image: linuxkit/rngd:842e5e8ece7934f0cab9fd0027b595ff3471e5b9
35+
cgroupsPath: systemreserved/rngd
3436
- name: ntpd
3537
image: linuxkit/openntpd:07a80c3e3e816658318ac027e1253ff9a228b8de
38+
cgroupsPath: systemreserved/ntpd
3639
- name: sshd
3740
image: linuxkit/sshd:b7f21ef1b13300a994e35eac3644e4f84f0ada8a
41+
cgroupsPath: systemreserved/sshd
3842
- name: kubelet
3943
image: linuxkit/kubelet:04e7aec28c89d2f408cd8810dd5b752a739f9a63
44+
cgroupsPath: podruntime/kubelet
4045
files:
4146
- path: etc/linuxkit.yml
4247
metadata: yaml

0 commit comments

Comments
 (0)