diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 17:00:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 17:00:48 +0100 |
| commit | 9f146b1b54736ec1b683e3a7381c85d10b1a66a3 (patch) | |
| tree | dd2ff39128e9aa3ba5bf67c7abc69aa59020f6b7 /pkg/spec | |
| parent | 105a42a2a46529312205cf852fa127627f8915e3 (diff) | |
| parent | 1951ff168a63157fa2f4711fde283edfc4981ed3 (diff) | |
| download | podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.gz podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.tar.bz2 podman-9f146b1b54736ec1b683e3a7381c85d10b1a66a3.zip | |
Merge pull request #4861 from giuseppe/add-cgroups-disabled-conmon
oci_conmon: do not create a cgroup under systemd
Diffstat (limited to 'pkg/spec')
| -rw-r--r-- | pkg/spec/namespaces.go | 4 | ||||
| -rw-r--r-- | pkg/spec/spec.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/spec/namespaces.go b/pkg/spec/namespaces.go index e62d4ed0a..1f98e6e25 100644 --- a/pkg/spec/namespaces.go +++ b/pkg/spec/namespaces.go @@ -213,8 +213,8 @@ func (c *CgroupConfig) ToCreateOptions(runtime *libpod.Runtime) ([]libpod.CtrCre options = append(options, libpod.WithCgroupParent(c.CgroupParent)) } - if c.Cgroups == "disabled" { - options = append(options, libpod.WithNoCgroups()) + if c.Cgroups != "" { + options = append(options, libpod.WithCgroupsMode(c.Cgroups)) } return options, nil diff --git a/pkg/spec/spec.go b/pkg/spec/spec.go index 7a220012f..cae055bb0 100644 --- a/pkg/spec/spec.go +++ b/pkg/spec/spec.go @@ -358,10 +358,10 @@ func (config *CreateConfig) createConfigToOCISpec(runtime *libpod.Runtime, userM return nil, errors.New("cannot specify resource limits when cgroups are disabled is specified") } configSpec.Linux.Resources = &spec.LinuxResources{} - case "enabled", "": + case "enabled", "no-conmon", "": // Do nothing default: - return nil, errors.New("unrecognized option for cgroups; supported are 'default' and 'disabled'") + return nil, errors.New("unrecognized option for cgroups; supported are 'default', 'disabled', 'no-conmon'") } // Add annotations |