diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-05-06 20:34:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-06 20:34:13 +0200 |
| commit | 8b5df5b5d97facad5bb84fe4597bf7f0059c09fa (patch) | |
| tree | 66296d6b47bc9627053bd0b3dadb07059cf711c6 /pkg/spec/namespaces.go | |
| parent | 22bf906e8cc440cb3c33b9eed620ae91f447b269 (diff) | |
| parent | f269be3a314a0903bb74a20de0e93b4f274531e6 (diff) | |
| download | podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.tar.gz podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.tar.bz2 podman-8b5df5b5d97facad5bb84fe4597bf7f0059c09fa.zip | |
Merge pull request #6092 from vrothberg/v2-kube
add {generate,play} kube
Diffstat (limited to 'pkg/spec/namespaces.go')
| -rw-r--r-- | pkg/spec/namespaces.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkg/spec/namespaces.go b/pkg/spec/namespaces.go index aebc90f68..40364b054 100644 --- a/pkg/spec/namespaces.go +++ b/pkg/spec/namespaces.go @@ -17,6 +17,10 @@ import ( "github.com/sirupsen/logrus" ) +// DefaultKernelNamespaces is a comma-separated list of default kernel +// namespaces. +const DefaultKernelNamespaces = "cgroup,ipc,net,uts" + // ToCreateOptions converts the input to a slice of container create options. func (c *NetworkConfig) ToCreateOptions(runtime *libpod.Runtime, userns *UserConfig) ([]libpod.CtrCreateOption, error) { var portBindings []ocicni.PortMapping @@ -154,9 +158,9 @@ func (c *NetworkConfig) ConfigureGenerator(g *generate.Generator) error { } if c.PublishAll { - g.Config.Annotations[libpod.InspectAnnotationPublishAll] = libpod.InspectResponseTrue + g.Config.Annotations[define.InspectAnnotationPublishAll] = define.InspectResponseTrue } else { - g.Config.Annotations[libpod.InspectAnnotationPublishAll] = libpod.InspectResponseFalse + g.Config.Annotations[define.InspectAnnotationPublishAll] = define.InspectResponseFalse } return nil |