Skip to content

Commit f6d1298

Browse files
author
Ian Campbell
committed
Move kubelet runtime.cgroups into image metadata
Since they are passed to kubelet from kublet.sh inside the image this seems a better place. Signed-off-by: Ian Campbell <ijc@docker.com>
1 parent 982760a commit f6d1298

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

pkg/kubelet/build.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ config:
2626
rootfsPropagation: shared
2727
pid: host
2828
runtime:
29+
cgroups:
30+
- systemreserved
31+
- podruntime
2932
mkdir:
3033
- /var/lib/kubeadm
3134
- /var/lib/cni/conf

yml/kube.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ services:
4242
- name: kubelet
4343
image: linuxkit/kubelet:0e6902fbb878f592b8be03605e18d917e622ce31
4444
cgroupsPath: podruntime/kubelet
45-
runtime:
46-
cgroups:
47-
- systemreserved
48-
- podruntime
4945
files:
5046
- path: etc/linuxkit.yml
5147
metadata: yaml

0 commit comments

Comments
 (0)