summaryrefslogtreecommitdiff
path: root/cmd/podman/pods/create.go
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-04-22 09:51:00 -0700
committerJhon Honce <jhonce@redhat.com>2020-04-22 09:53:05 -0700
commitd0caf90940943a7fbf80b27ec59adcdd501fa49e (patch)
tree96bc6a9b3fdb6ab841ad6ba7cab6ff3e63c6149c /cmd/podman/pods/create.go
parent7f1d00108e441b012785fa9d6e75317bad7ce239 (diff)
downloadpodman-d0caf90940943a7fbf80b27ec59adcdd501fa49e.tar.gz
podman-d0caf90940943a7fbf80b27ec59adcdd501fa49e.tar.bz2
podman-d0caf90940943a7fbf80b27ec59adcdd501fa49e.zip
V2 Restore exists E2E tests
* Fix setting exit code in */exists.go Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman/pods/create.go')
-rw-r--r--cmd/podman/pods/create.go35
1 files changed, 17 insertions, 18 deletions
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 647cf24b2..ff21166f3 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -69,10 +69,24 @@ func create(cmd *cobra.Command, args []string) error {
return errors.Wrapf(err, "unable to process labels")
}
- if !createOptions.Infra && cmd.Flag("share").Changed && share != "none" && share != "" {
- return errors.Errorf("You cannot share kernel namespaces on the pod level without an infra container")
+ if !createOptions.Infra {
+ if cmd.Flag("infra-command").Changed {
+ return errors.New("cannot set infra-command without an infra container")
+ }
+ createOptions.InfraCommand = ""
+ if cmd.Flag("infra-image").Changed {
+ return errors.New("cannot set infra-image without an infra container")
+ }
+ createOptions.InfraImage = ""
+
+ if cmd.Flag("share").Changed && share != "none" && share != "" {
+ return fmt.Errorf("cannot set share(%s) namespaces without an infra container", cmd.Flag("share").Value)
+ }
+ createOptions.Share = nil
+ } else {
+ createOptions.Share = strings.Split(share, ",")
}
- createOptions.Share = strings.Split(share, ",")
+
if cmd.Flag("pod-id-file").Changed {
podIdFile, err = util.OpenExclusiveFile(podIDFile)
if err != nil && os.IsExist(err) {
@@ -122,21 +136,6 @@ func create(cmd *cobra.Command, args []string) error {
}
}
- if !createOptions.Infra {
- if cmd.Flag("infra-command").Changed {
- return errors.New("cannot set infra-command without an infra container")
- }
- createOptions.InfraCommand = ""
- if cmd.Flag("infra-image").Changed {
- return errors.New("cannot set infra-image without an infra container")
- }
- createOptions.InfraImage = ""
- if cmd.Flag("share").Changed {
- return errors.New("cannot set share namespaces without an infra container")
- }
- createOptions.Share = nil
- }
-
response, err := registry.ContainerEngine().PodCreate(context.Background(), createOptions)
if err != nil {
return err