Skip to content

Commit b55f055

Browse files
committed
Remove runtime ulimit fix to test Dockerfile-only approach
1 parent 055c5fe commit b55f055

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

pkg/minikube/cruntime/containerd.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,6 @@ func generateContainerdConfig(cr CommandRunner, imageRepository string, kv semve
224224
return nil
225225
}
226226

227-
// setContainerdUlimit sets LimitNOFILE for containerd to match docker's default ulimit
228-
func setContainerdUlimit(cr CommandRunner) error {
229-
// Create systemd drop-in override to set LimitNOFILE=1048576
230-
cmd := exec.Command("sh", "-c", `sudo mkdir -p /etc/systemd/system/containerd.service.d && printf '[Service]\nLimitNOFILE=1048576\n' | sudo tee /etc/systemd/system/containerd.service.d/override.conf > /dev/null && sudo systemctl daemon-reload`)
231-
_, err := cr.RunCmd(cmd)
232-
return err
233-
}
234-
235227
// Enable idempotently enables containerd on a host
236228
// It is also called by docker.Enable() - if bound to containerd, to enforce proper containerd configuration completed by service restart.
237229
func (r *Containerd) Enable(disOthers bool, cgroupDriver string, inUserNamespace bool) error {
@@ -257,13 +249,6 @@ func (r *Containerd) Enable(disOthers bool, cgroupDriver string, inUserNamespace
257249
if err := generateContainerdConfig(r.Runner, r.ImageRepository, r.KubernetesVersion, cgroupDriver, r.InsecureRegistry, inUserNamespace); err != nil {
258250
return err
259251
}
260-
261-
// Set LimitNOFILE for containerd to match docker's default ulimit (1048576)
262-
// This ensures consistent file descriptor limits across container runtimes
263-
if err := setContainerdUlimit(r.Runner); err != nil {
264-
klog.Warningf("failed to set containerd ulimit: %v", err)
265-
}
266-
267252
if err := enableIPForwarding(r.Runner); err != nil {
268253
return err
269254
}

0 commit comments

Comments
 (0)