opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-26 04:46:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18052 from sstosh/resource-rootless

Browse Source 
Do not display the resource limits warning message
This commit is contained in:
OpenShift Merge Robot
2023-04-12 06:40:08 -04:00
committed by GitHub
parent 8a9386d898 4f5f89cf88
commit ab3025568f
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/specgen/generate/validate.go
View File

@ -5,12 +5,14 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"reflect"
"github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/cgroups"
"github.com/containers/common/pkg/sysinfo" "github.com/containers/common/pkg/sysinfo"
"github.com/containers/podman/v4/pkg/rootless" "github.com/containers/podman/v4/pkg/rootless"
"github.com/containers/podman/v4/pkg/specgen" "github.com/containers/podman/v4/pkg/specgen"
"github.com/containers/podman/v4/utils" "github.com/containers/podman/v4/utils"
"github.com/opencontainers/runtime-spec/specs-go"
) )
// Verify resource limits are sanely set when running on cgroup v1. // 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) sysInfo := sysinfo.New(true)
if s.ResourceLimits != nil && rootless.IsRootless() { // If ResourceLimits is nil, return without warning
s.ResourceLimits = nil resourceNil := &specgen.SpecGenerator{}
warnings = append(warnings, "Resource limits are not supported and ignored on cgroups V1 rootless systems") resourceNil.ResourceLimits = &specs.LinuxResources{}
if s.ResourceLimits == nil || reflect.DeepEqual(s.ResourceLimits, resourceNil.ResourceLimits) {
return nil, nil
} }
if s.ResourceLimits == nil { // Cgroups V1 rootless system does not support Resource limits
return warnings, nil if rootless.IsRootless() {
return []string{"Resource limits are not supported and ignored on cgroups V1 rootless systems"}, nil
} }
if s.ResourceLimits.Unified != nil { if s.ResourceLimits.Unified != nil {

1
test/system/700-play.bats
View File

@ -237,7 +237,6 @@ EOF
} }
@test "podman kube --network" { @test "podman kube --network" {
skip_if_rootless_cgroupsv1 "Test will never be supported, see #17582."
TESTDIR=$PODMAN_TMPDIR/testdir TESTDIR=$PODMAN_TMPDIR/testdir
mkdir -p $TESTDIR mkdir -p $TESTDIR
echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml echo "$testYaml" | sed "s|TESTDIR|${TESTDIR}|g" > $PODMAN_TMPDIR/test.yaml