Merge pull request #760 from jbarrick-mesosphere/master

Set LimitNOFILE=1048576 in containerd unit file to match upstream containerd.
kubernetes-sigs · Aug 8, 2019 · 5315b86 · 5315b86
2 parents 991e45e + 86156b3
commit 5315b86
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/images/base/10-limits.conf b/images/base/10-limits.conf
@@ -0,0 +1,5 @@
+# The Ubuntu upstream containerd.service specifies Limit NOFILE=infinity, but this causes problems with certain applications (e.g.,
+# NFS and MySQL).
+# This brings the unit file in line with upstream containerd's configuration.
+[Service]
+LimitNOFILE=1048576
diff --git a/images/base/Dockerfile b/images/base/Dockerfile
@@ -76,8 +76,8 @@ RUN clean-install \
     && chmod +x /usr/local/bin/ctr \
     && echo "done installing packages"
 
-# add restart override to containerd
-COPY 10-restart.conf /etc/systemd/system/containerd.service.d/
+# add overrides to containerd
+COPY 10-limits.conf 10-restart.conf /etc/systemd/system/containerd.service.d/
 
 # debug containerd version and create default config
 # additionally, disable some plugins we don't use / support