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

Merge pull request #348 from Random-Liu/remove-oomscore-in-systemd

Browse Source 
Remove the oom score in systemd unit. cri-containerd sets it by itself.
This commit is contained in:
Lantao Liu 2017-10-12 20:45:00 -07:00 committed by GitHub
commit 4b8f87214d
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/systemd-units/cri-containerd.service
View File

@ -7,7 +7,6 @@ After=containerd.service
Restart=always Restart=always
RestartSec=5 RestartSec=5
ExecStart=/usr/local/bin/cri-containerd --logtostderr ExecStart=/usr/local/bin/cri-containerd --logtostderr
OOMScoreAdjust=-999
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
test/e2e_node/init.yaml
View File

@ -68,7 +68,6 @@ write_files:
[Service] [Service]
Restart=always Restart=always
RestartSec=5 RestartSec=5
OOMScoreAdjust=-999
ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \ ExecStart=/home/cri-containerd/usr/local/bin/cri-containerd \
--alsologtostderr --v=4 \ --alsologtostderr --v=4 \
--network-bin-dir=/home/cri-containerd/opt/cni/bin \ --network-bin-dir=/home/cri-containerd/opt/cni/bin \