From cd1611362f6f8e7b20b5962b20a5b37d624d8cc6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Dec 2023 10:35:15 +0000 Subject: [chore]: Bump github.com/KimMachineGun/automemlimit from 0.3.0 to 0.4.0 (#2440) Bumps [github.com/KimMachineGun/automemlimit](https://github.com/KimMachineGun/automemlimit) from 0.3.0 to 0.4.0. - [Commits](https://github.com/KimMachineGun/automemlimit/compare/v0.3.0...v0.4.0) --- updated-dependencies: - dependency-name: github.com/KimMachineGun/automemlimit dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go') diff --git a/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go b/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go index a5c22de32..cfe6d0f60 100644 --- a/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go +++ b/vendor/github.com/KimMachineGun/automemlimit/memlimit/cgroups.go @@ -21,7 +21,7 @@ func FromCgroup() (uint64, error) { case cgroups.Legacy: return FromCgroupV1() case cgroups.Hybrid: - return fromCgroupHybrid() + return FromCgroupHybrid() case cgroups.Unified: return FromCgroupV2() } @@ -49,10 +49,9 @@ func FromCgroupV1() (uint64, error) { return 0, ErrNoLimit } -// fromCgroupHybrid returns the memory limit from the cgroup v1 or v2. +// FromCgroupHybrid returns the memory limit from the cgroup v1 or v2. // It checks the cgroup v2 first, and if it fails, it falls back to cgroup v1. -// TODO: make this function public in the next minor version. -func fromCgroupHybrid() (uint64, error) { +func FromCgroupHybrid() (uint64, error) { limit, err := fromCgroupV2(filepath.Join(cgroupMountPoint, "unified")) if err == nil { return limit, nil -- cgit v1.2.3