diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-13 13:12:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-13 13:12:48 +0100 |
| commit | cca6df428cb9ce187ae1341740ac1137c7a67a75 (patch) | |
| tree | 7372a67e90ea951c0ad2f64bc9c3a676f4b54fe1 /pkg/domain | |
| parent | 8f3fb743ee57964594b36fdffb7b8fc5e3ca3371 (diff) | |
| parent | 9226ccb59f5967f5c784280b993711530615dcd7 (diff) | |
| download | podman-cca6df428cb9ce187ae1341740ac1137c7a67a75.tar.gz podman-cca6df428cb9ce187ae1341740ac1137c7a67a75.tar.bz2 podman-cca6df428cb9ce187ae1341740ac1137c7a67a75.zip | |
Merge pull request #12272 from hshiina/memory-swappiness
Enable 'podman run --memory-swappiness=0'
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/entities/pods.go | 9 | ||||
| -rw-r--r-- | pkg/domain/infra/abi/play.go | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 1df18be58..70d2be1e6 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -266,6 +266,15 @@ type ContainerCreateOptions struct { CgroupConf []string } +func NewInfraContainerCreateOptions() ContainerCreateOptions { + options := ContainerCreateOptions{ + IsInfra: true, + ImageVolume: "bind", + MemorySwappiness: -1, + } + return options +} + type PodCreateReport struct { Id string //nolint } diff --git a/pkg/domain/infra/abi/play.go b/pkg/domain/infra/abi/play.go index 3fdb3f286..d2bb95f7c 100644 --- a/pkg/domain/infra/abi/play.go +++ b/pkg/domain/infra/abi/play.go @@ -270,7 +270,7 @@ func (ic *ContainerEngine) playKubePod(ctx context.Context, podName string, podY if podOpt.Infra { infraImage := util.DefaultContainerConfig().Engine.InfraImage - infraOptions := entities.ContainerCreateOptions{ImageVolume: "bind"} + infraOptions := entities.NewInfraContainerCreateOptions() podSpec.PodSpecGen.InfraImage = infraImage podSpec.PodSpecGen.NoInfra = false podSpec.PodSpecGen.InfraContainerSpec = specgen.NewSpecGenerator(infraImage, false) |