mirror of
https://github.com/containers/podman.git
synced 2025-06-25 20:26:51 +08:00
Do not display the resource limits warning message
If resource limits is not set, do not display the following warning message: `Resource limits are not supported and ignored on cgroups V1 rootless systems` Ref: #17582 Signed-off-by: Toshiki Sonoda <sonoda.toshiki@fujitsu.com>
This commit is contained in:

committed by
Toshiki Sonoda

parent
4857c65d3e
commit
4f5f89cf88
@ -5,12 +5,14 @@ import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"reflect"
|
||||
|
||||
"github.com/containers/common/pkg/cgroups"
|
||||
"github.com/containers/common/pkg/sysinfo"
|
||||
"github.com/containers/podman/v4/pkg/rootless"
|
||||
"github.com/containers/podman/v4/pkg/specgen"
|
||||
"github.com/containers/podman/v4/utils"
|
||||
"github.com/opencontainers/runtime-spec/specs-go"
|
||||
)
|
||||
|
||||
// Verify resource limits are sanely set when running on cgroup v1.
|
||||
@ -19,13 +21,16 @@ func verifyContainerResourcesCgroupV1(s *specgen.SpecGenerator) ([]string, error
|
||||
|
||||
sysInfo := sysinfo.New(true)
|
||||
|
||||
if s.ResourceLimits != nil && rootless.IsRootless() {
|
||||
s.ResourceLimits = nil
|
||||
warnings = append(warnings, "Resource limits are not supported and ignored on cgroups V1 rootless systems")
|
||||
// If ResourceLimits is nil, return without warning
|
||||
resourceNil := &specgen.SpecGenerator{}
|
||||
resourceNil.ResourceLimits = &specs.LinuxResources{}
|
||||
if s.ResourceLimits == nil || reflect.DeepEqual(s.ResourceLimits, resourceNil.ResourceLimits) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
if s.ResourceLimits == nil {
|
||||
return warnings, nil
|
||||
// Cgroups V1 rootless system does not support Resource limits
|
||||
if rootless.IsRootless() {
|
||||
return []string{"Resource limits are not supported and ignored on cgroups V1 rootless systems"}, nil
|
||||
}
|
||||
|
||||
if s.ResourceLimits.Unified != nil {
|
||||
|
@ -236,7 +236,6 @@ EOF
|
||||
}
|
||||
|
||||
@test "podman kube --network" {
|
||||
skip_if_rootless_cgroupsv1 "Test will never be supported, see #17582."
|
||||
TESTDIR=$PODMAN_TMPDIR/testdir
|
||||
mkdir -p $TESTDIR
|
||||
echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml
|
||||
|
Reference in New Issue
Block a user