Skip to content

Commit c920499

Browse files
author
Ian Campbell
committed
Move pods into "kubepods" cgroup.
Previously with docker runtime they would be in /sys/fs/cgroups/*/docker/ (or even /sys/fs/cgroups/*/podruntime/docker/) and with cri-containerd in /sys/fs/cgroups/*/k8s.io/. If using --cgroups-per-qos then a slightly different --cgroup-root is required, leave a comment. Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent f6d1298 commit c920499

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

pkg/kubelet/build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ config:
2929
cgroups:
3030
- systemreserved
3131
- podruntime
32+
- kubepods
3233
mkdir:
3334
- /var/lib/kubeadm
3435
- /var/lib/cni/conf

pkg/kubelet/kubelet.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ echo "kubelet.sh: ${await} has arrived" 2>&1
6363

6464
mkdir -p /etc/kubernetes/manifests
6565

66+
# If using --cgroups-per-qos then need to use --cgroup-root=/ and not
67+
# the --cgroup-root=kubepods from below. This can be done at image
68+
# build time by adding to the service definition:
69+
#
70+
# command:
71+
# - /usr/bin/kubelet.sh
72+
# - --cgroup-root=/
73+
# - --cgroups-per-qos
6674
exec kubelet --kubeconfig=/etc/kubernetes/kubelet.conf \
6775
--bootstrap-kubeconfig=/etc/kubernetes/bootstrap-kubelet.conf \
6876
--pod-manifest-path=/etc/kubernetes/manifests \
@@ -77,4 +85,5 @@ exec kubelet --kubeconfig=/etc/kubernetes/kubelet.conf \
7785
--cadvisor-port=0 \
7886
--kube-reserved-cgroup=podruntime \
7987
--system-reserved-cgroup=systemreserved \
88+
--cgroup-root=kubepods \
8089
$KUBELET_ARGS $@

0 commit comments

Comments
 (0)