diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-16 16:40:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-16 16:40:44 -0400 |
| commit | 8d7e7954546efb344d677e0c3c86d9d045a3de4f (patch) | |
| tree | 387d9f86b2507ab4ec9b5c0f4e77fca39940aa8b /pkg/specgen/pod_validate.go | |
| parent | acf86ef5ab9c5307fe0bdc93bf534decaafe38ae (diff) | |
| parent | b3d6383f25e71748793535733a767c60ccfcbd82 (diff) | |
| download | podman-8d7e7954546efb344d677e0c3c86d9d045a3de4f.tar.gz podman-8d7e7954546efb344d677e0c3c86d9d045a3de4f.tar.bz2 podman-8d7e7954546efb344d677e0c3c86d9d045a3de4f.zip | |
Merge pull request #7621 from rhatdan/pods
Fix podman pod create --infra-command and --infra-image
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 } |