diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-31 22:39:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 22:39:01 +0100 |
| commit | 95b2fd6c273ded741614665644c431a1c7831a70 (patch) | |
| tree | e09c845896ba74942de8ec13e4404df393f374a5 /pkg/spec | |
| parent | a15a20d3c5898017e1549028fd8960d421240918 (diff) | |
| parent | 28ad43940f3bfca3870a5450342c4b79c6a2f60f (diff) | |
| download | podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.gz podman-95b2fd6c273ded741614665644c431a1c7831a70.tar.bz2 podman-95b2fd6c273ded741614665644c431a1c7831a70.zip | |
Merge pull request #4403 from mheon/cherrypick_163
Cherrypicks for v1.6.3 final
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/spec.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index da5c14948..86d701f7e 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -5,6 +5,8 @@ import ( "strings" "github.com/containers/libpod/libpod" + libpodconfig "github.com/containers/libpod/libpod/config" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/cgroups" "github.com/containers/libpod/pkg/rootless" "github.com/containers/libpod/pkg/sysinfo" @@ -300,7 +302,7 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM blockAccessToKernelFilesystems(config, &g) - var runtimeConfig *libpod.RuntimeConfig + var runtimeConfig *libpodconfig.Config if runtime != nil { runtimeConfig, err = runtime.GetConfig() @@ -321,7 +323,7 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM if err != nil { return nil, err } - if (!cgroup2 || (runtimeConfig != nil && runtimeConfig.CgroupManager != libpod.SystemdCgroupsManager)) && config.Resources.PidsLimit == sysinfo.GetDefaultPidsLimit() { + if (!cgroup2 || (runtimeConfig != nil && runtimeConfig.CgroupManager != define.SystemdCgroupsManager)) && config.Resources.PidsLimit == sysinfo.GetDefaultPidsLimit() { setPidLimit = false } } @@ -417,7 +419,7 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM configSpec.Linux.Resources = &spec.LinuxResources{} } - canUseResources := cgroup2 && runtimeConfig != nil && (runtimeConfig.CgroupManager == libpod.SystemdCgroupsManager) + canUseResources := cgroup2 && runtimeConfig != nil && (runtimeConfig.CgroupManager == define.SystemdCgroupsManager) if addedResources && !canUseResources { return nil, errors.New("invalid configuration, cannot specify resource limits without cgroups v2 and --cgroup-manager=systemd") |