Merge pull request #16300 from kubernetes/revert-16151-limitnofile-patch

Revert "Don't set LimitNoFile for containerd systemd unit file"
kubernetes · Jan 30, 2024 · 6a1783b · 6a1783b
2 parents dd7548c + f445dfc
commit 6a1783b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/nodeup/pkg/model/containerd.go b/nodeup/pkg/model/containerd.go
@@ -203,6 +203,7 @@ func (b *ContainerdBuilder) buildSystemdService(sv semver.Version) *nodetasks.Se
 
 	manifest.Set("Service", "LimitNPROC", "infinity")
 	manifest.Set("Service", "LimitCORE", "infinity")
+	manifest.Set("Service", "LimitNOFILE", "infinity")
 	manifest.Set("Service", "TasksMax", "infinity")
 
 	// make killing of processes of this unit under memory pressure very unlikely

diff --git a/nodeup/pkg/model/tests/containerdbuilder/complex/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/complex/tasks.yaml
@@ -362,6 +362,7 @@ definition: |
   RestartSec=5
   LimitNPROC=infinity
   LimitCORE=infinity
+  LimitNOFILE=infinity
   TasksMax=infinity
   OOMScoreAdjust=-999
 

diff --git a/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/containerdbuilder/simple/tasks.yaml
@@ -355,6 +355,7 @@ definition: |
   RestartSec=5
   LimitNPROC=infinity
   LimitCORE=infinity
+  LimitNOFILE=infinity
   TasksMax=infinity
   OOMScoreAdjust=-999