opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-06 23:08:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5627 from baude/apiv2createnet

Browse Source 
apiv2 add default network in specgen
This commit is contained in:
OpenShift Merge Robot
2020-03-26 18:59:47 +01:00
committed by GitHub
parent e2cab552de cac8bcdd7e
commit 14ece7ecaf
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/specgen/validate.go
View File

@ -3,6 +3,8 @@ package specgen
import ( import (
"strings" "strings"
"github.com/containers/libpod/pkg/rootless"
"github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod"
"github.com/containers/libpod/pkg/util" "github.com/containers/libpod/pkg/util"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -138,9 +140,6 @@ func (s *SpecGenerator) validate(rt *libpod.Runtime) error {
if err := s.IpcNS.validate(); err != nil { if err := s.IpcNS.validate(); err != nil {
return err return err
} }
if err := validateNetNS(&s.NetNS); err != nil {
return err
}
if err := s.PidNS.validate(); err != nil { if err := s.PidNS.validate(); err != nil {
return err return err
} }
@ -155,5 +154,16 @@ func (s *SpecGenerator) validate(rt *libpod.Runtime) error {
if len(s.WorkDir) < 1 { if len(s.WorkDir) < 1 {
s.WorkDir = "/" s.WorkDir = "/"
} }
// Set defaults if network info is not provided
if s.NetNS.NSMode == "" {
s.NetNS.NSMode = Bridge
if rootless.IsRootless() {
s.NetNS.NSMode = Slirp
}
}
if err := validateNetNS(&s.NetNS); err != nil {
return err
}
return nil return nil
} }