diff options
| author | Doug Rabson <dfr@rabson.org> | 2022-09-05 13:55:51 +0100 |
|---|---|---|
| committer | Doug Rabson <dfr@rabson.org> | 2022-09-08 08:24:18 +0100 |
| commit | 911e4a1389c6c0ae435d8dc36378fdc2bbfe3eee (patch) | |
| tree | 16510d1de04a7b2ca40ffba1412e6c1fd3f3cf64 /pkg/specgen/generate/container.go | |
| parent | ac8c1e1c22e5a2a69dc067523aa7faeeed79abdd (diff) | |
| download | podman-911e4a1389c6c0ae435d8dc36378fdc2bbfe3eee.tar.gz podman-911e4a1389c6c0ae435d8dc36378fdc2bbfe3eee.tar.bz2 podman-911e4a1389c6c0ae435d8dc36378fdc2bbfe3eee.zip | |
specgen/generate: Factor out setting resource limits from CompleteSpec
This avoids setting values in the spec which are not supported on
FreeBSD - including these values causes warning messages for the
unsupported features.
[NO NEW TESTS NEEDED]
Signed-off-by: Doug Rabson <dfr@rabson.org>
Diffstat (limited to 'pkg/specgen/generate/container.go')
| -rw-r--r-- | pkg/specgen/generate/container.go | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 46b7a2dc2..c4fbda9e5 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -18,7 +18,6 @@ import ( envLib "github.com/containers/podman/v4/pkg/env" "github.com/containers/podman/v4/pkg/signal" "github.com/containers/podman/v4/pkg/specgen" - spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/openshift/imagebuilder" "github.com/sirupsen/logrus" ) @@ -272,19 +271,7 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat } // If caller did not specify Pids Limits load default - if s.ResourceLimits == nil || s.ResourceLimits.Pids == nil { - if s.CgroupsMode != "disabled" { - limit := rtc.PidsLimit() - if limit != 0 { - if s.ResourceLimits == nil { - s.ResourceLimits = &spec.LinuxResources{} - } - s.ResourceLimits.Pids = &spec.LinuxPids{ - Limit: limit, - } - } - } - } + s.InitResourceLimits(rtc) if s.LogConfiguration == nil { s.LogConfiguration = &specgen.LogConfig{} |