Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/1.6] cri: fix memory.memsw.limit_in_bytes: no such file or directory #7838

Merged

Commits on Dec 19, 2022

  1. cri: fix memory.memsw.limit_in_bytes: no such file or directory

    Skip automatic `if swapLimit == 0 { s.Linux.Resources.Memory.Swap = &limit }` when the swap controller is missing.
    (default on Ubuntu 20.04)
    
    Fix issue 7828 (regression in PR 7783 "cri: make swapping disabled with memory limit")
    
    Cherry-Pick was not cleaned, required updated cgroups library from v1.0.3 to v1.0.4
    
    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
    (cherry picked from commit 4157503)
    Signed-off-by: Derek McGowan <derek@mcg.dev>
    AkihiroSuda authored and dmcgowan committed Dec 19, 2022
    Copy the full SHA
    53c733e View commit details
    Browse the repository at this point in the history