aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-31 18:35:44 -0400
committerGitHub <noreply@github.com>2020-07-31 18:35:44 -0400
commit4c75fe3f70ed5807a319b6a581964a2d468a84a1 (patch)
tree669896fe08aace7b5e6b2c0a69ca23dc71d516ab /pkg
parent7a15be546adffe4f884abfbd4ed02f69ac7659e0 (diff)
parent949dfc85a0118387aaeffe77f0d9e4be33d93f2e (diff)
downloadpodman-4c75fe3f70ed5807a319b6a581964a2d468a84a1.tar.gz
podman-4c75fe3f70ed5807a319b6a581964a2d468a84a1.tar.bz2
podman-4c75fe3f70ed5807a319b6a581964a2d468a84a1.zip
Merge pull request #7152 from Luap99/fix#7087
fix pod creation with "new:" syntax
Diffstat (limited to 'pkg')
-rw-r--r--pkg/specgen/generate/namespaces.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/specgen/generate/namespaces.go b/pkg/specgen/generate/namespaces.go
index b8ab1399e..7adb8be6a 100644
--- a/pkg/specgen/generate/namespaces.go
+++ b/pkg/specgen/generate/namespaces.go
@@ -462,6 +462,10 @@ func specConfigureNamespaces(s *specgen.SpecGenerator, g *generate.Generator, rt
func GetNamespaceOptions(ns []string) ([]libpod.PodCreateOption, error) {
var options []libpod.PodCreateOption
var erroredOptions []libpod.PodCreateOption
+ if ns == nil {
+ //set the default namespaces
+ ns = strings.Split(specgen.DefaultKernelNamespaces, ",")
+ }
for _, toShare := range ns {
switch toShare {
case "cgroup":