github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Use systemd service cgroup and oom score adj.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2018-03-28 00:28:05 +00:00 committed by Derek McGowan
parent af8bd80689
commit cdb4aec93a
No known key found for this signature in database
GPG Key ID: F58C5D0A4405ACDB
3 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
contrib/gce/cloud-init/master.yaml
View File

@ -30,12 +30,6 @@ write_files:
permissions: 0644 permissions: 0644
owner: root owner: root
content: | content: |
# installed by cloud-init
oom_score = -999
[cgroup]
path = "/runtime"
[plugins.linux] [plugins.linux]
shim = "/home/containerd/usr/local/bin/containerd-shim" shim = "/home/containerd/usr/local/bin/containerd-shim"
runtime = "/home/containerd/usr/local/sbin/runc" runtime = "/home/containerd/usr/local/sbin/runc"
@ -61,6 +55,7 @@ write_files:
RestartSec=5 RestartSec=5
Delegate=yes Delegate=yes
KillMode=process KillMode=process
OOMScoreAdjust=-999
LimitNOFILE=1048576 LimitNOFILE=1048576
# Having non-zero Limit*s causes performance problems due to accounting overhead # Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting. # in the kernel. We recommend using cgroups to do container-local accounting.

7
contrib/gce/cloud-init/node.yaml
View File

@ -28,12 +28,6 @@ write_files:
permissions: 0644 permissions: 0644
owner: root owner: root
content: | content: |
# installed by cloud-init
oom_score = -999
[cgroup]
path = "/runtime"
[plugins.linux] [plugins.linux]
shim = "/home/containerd/usr/local/bin/containerd-shim" shim = "/home/containerd/usr/local/bin/containerd-shim"
runtime = "/home/containerd/usr/local/sbin/runc" runtime = "/home/containerd/usr/local/sbin/runc"
@ -59,6 +53,7 @@ write_files:
RestartSec=5 RestartSec=5
Delegate=yes Delegate=yes
KillMode=process KillMode=process
OOMScoreAdjust=-999
LimitNOFILE=1048576 LimitNOFILE=1048576
# Having non-zero Limit*s causes performance problems due to accounting overhead # Having non-zero Limit*s causes performance problems due to accounting overhead
# in the kernel. We recommend using cgroups to do container-local accounting. # in the kernel. We recommend using cgroups to do container-local accounting.

2
contrib/gce/env
View File

@ -15,5 +15,5 @@ export KUBE_CONTAINER_RUNTIME_ENDPOINT="/run/containerd/containerd.sock"
export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load" export KUBE_LOAD_IMAGE_COMMAND="/home/containerd/usr/local/bin/ctr cri load"
export NETWORK_POLICY_PROVIDER="calico" export NETWORK_POLICY_PROVIDER="calico"
export NON_MASQUERADE_CIDR="0.0.0.0/0" export NON_MASQUERADE_CIDR="0.0.0.0/0"
export KUBE_KUBELET_EXTRA_ARGS="--runtime-cgroups=/runtime" export KUBE_KUBELET_EXTRA_ARGS="--runtime-cgroups=/system.slice/containerd.service"
export KUBE_FEATURE_GATES="ExperimentalCriticalPodAnnotation=true,CRIContainerLogRotation=true" export KUBE_FEATURE_GATES="ExperimentalCriticalPodAnnotation=true,CRIContainerLogRotation=true"