summaryrefslogtreecommitdiff
path: root/pkg/specgen/pod_validate.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-07-16 07:53:43 -0400
committerGitHub <noreply@github.com>2021-07-16 07:53:43 -0400
commitce28dc3c4c3dba468ddb6f2a249c0c4bfc058805 (patch)
tree0f16371ff56a8323db480d010b0315e600c2a50b /pkg/specgen/pod_validate.go
parent3ba9f2a205787135b4e34e4d217df3ab9d0071b8 (diff)
parentaf40dfc2bf614aeb4191916cc2420068696eb776 (diff)
downloadpodman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.tar.gz
podman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.tar.bz2
podman-ce28dc3c4c3dba468ddb6f2a249c0c4bfc058805.zip
Merge pull request #10820 from jvanz/indfra-container-name-issue-10794
--infra-name command line argument
Diffstat (limited to 'pkg/specgen/pod_validate.go')
-rw-r--r--pkg/specgen/pod_validate.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgen/pod_validate.go b/pkg/specgen/pod_validate.go
index c746bcd1a..bca7b6dbe 100644
--- a/pkg/specgen/pod_validate.go
+++ b/pkg/specgen/pod_validate.go
@@ -36,6 +36,9 @@ func (p *PodSpecGenerator) Validate() error {
if len(p.InfraImage) > 0 {
return exclusivePodOptions("NoInfra", "InfraImage")
}
+ if len(p.InfraName) > 0 {
+ return exclusivePodOptions("NoInfra", "InfraName")
+ }
if len(p.SharedNamespaces) > 0 {
return exclusivePodOptions("NoInfra", "SharedNamespaces")
}