mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-13 19:36:22 +00:00
a2f1c24254
Automatic merge from submit-queue (batch tested with PRs 60759, 60531, 60923, 60851, 58717). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Subtract inactive_file from usage when setting memcg threshold **What this PR does / why we need it**: Implements solution for #51745, proposed in https://github.com/kubernetes/community/pull/1451. This is a prerequisite to fixing https://github.com/kubernetes/kubernetes/issues/57901. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #51745 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` /sig node /priority important-longterm /kind bug /assign @sjenning @derekwaynecarr @dchen1107