diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-13 11:54:08 -0400 |
---|---|---|
committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-09-16 07:42:19 -0400 |
commit | b3d6383f25e71748793535733a767c60ccfcbd82 (patch) | |
tree | 847b11be7a0587ff338ed45232b889ed359df6c1 /pkg/specgen/pod_validate.go | |
parent | 0d14d7b7152ac7a0856fcbb2bbc0f7238ab182d6 (diff) | |
download | podman-b3d6383f25e71748793535733a767c60ccfcbd82.tar.gz podman-b3d6383f25e71748793535733a767c60ccfcbd82.tar.bz2 podman-b3d6383f25e71748793535733a767c60ccfcbd82.zip |
Fix podman pod create --infra-command and --infra-image
Currently infr-command and --infra-image commands are ignored
from the user. This PR instruments them and adds tests for
each combination.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/specgen/pod_validate.go')
-rw-r--r-- | pkg/specgen/pod_validate.go | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go index d5e0aecf2..907c0bb69 100644 --- a/pkg/specgen/pod_validate.go +++ b/pkg/specgen/pod_validate.go @@ -95,12 +95,5 @@ func (p *PodSpecGenerator) Validate() error { return exclusivePodOptions("NoManageHosts", "HostAdd") } - // Set Defaults - if len(p.InfraImage) < 1 { - p.InfraImage = containerConfig.Engine.InfraImage - } - if len(p.InfraCommand) < 1 { - p.InfraCommand = []string{containerConfig.Engine.InfraCommand} - } return nil } |