diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-06-02 08:48:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-02 08:48:07 -0400 |
| commit | 8b972ff8ca2d44d7d724d84e00bec3afb90feb20 (patch) | |
| tree | cea7add9a3326c0bbdfba3651625224010868b28 /pkg/specgen/container_validate.go | |
| parent | e60c41657b47584d99a16e5ba5bac253063c2fb4 (diff) | |
| parent | 2805c7353b15679d66eec988949bb79e1e320805 (diff) | |
| download | podman-8b972ff8ca2d44d7d724d84e00bec3afb90feb20.tar.gz podman-8b972ff8ca2d44d7d724d84e00bec3afb90feb20.tar.bz2 podman-8b972ff8ca2d44d7d724d84e00bec3afb90feb20.zip | |
Merge pull request #14436 from Luap99/net-remote-default
pkg/specgen: parse default network mode on server
Diffstat (limited to 'pkg/specgen/container_validate.go')
| -rw-r--r-- | pkg/specgen/container_validate.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkg/specgen/container_validate.go b/pkg/specgen/container_validate.go index 532a2094f..5616a4511 100644 --- a/pkg/specgen/container_validate.go +++ b/pkg/specgen/container_validate.go @@ -183,10 +183,12 @@ func (s *SpecGenerator) Validate() error { } // Set defaults if network info is not provided - if s.NetNS.NSMode == "" { - s.NetNS.NSMode = Bridge + // when we are rootless we default to slirp4netns + if s.NetNS.IsPrivate() || s.NetNS.IsDefault() { if rootless.IsRootless() { s.NetNS.NSMode = Slirp + } else { + s.NetNS.NSMode = Bridge } } if err := validateNetNS(&s.NetNS); err != nil { |