diff options
author | Doug Rabson <dfr@rabson.org> | 2022-08-27 15:13:24 +0100 |
---|---|---|
committer | Doug Rabson <dfr@rabson.org> | 2022-09-05 10:20:50 +0100 |
commit | 212b11c34cf366e6408cb889a5a07660bdabb3e6 (patch) | |
tree | e0611cedce0f59e206ccef21478e398d662b2451 /libpod/container_internal_common.go | |
parent | eab4291d996e8aab34f97d79d76816afa976687e (diff) | |
download | podman-212b11c34cf366e6408cb889a5a07660bdabb3e6.tar.gz podman-212b11c34cf366e6408cb889a5a07660bdabb3e6.tar.bz2 podman-212b11c34cf366e6408cb889a5a07660bdabb3e6.zip |
libpod: Factor out handling of slirp4netns and net=none
[NO NEW TESTS NEEDED]
Signed-off-by: Doug Rabson <dfr@rabson.org>
Diffstat (limited to 'libpod/container_internal_common.go')
-rw-r--r-- | libpod/container_internal_common.go | 35 |
1 files changed, 4 insertions, 31 deletions
diff --git a/libpod/container_internal_common.go b/libpod/container_internal_common.go index 11e791063..f44b8a625 100644 --- a/libpod/container_internal_common.go +++ b/libpod/container_internal_common.go @@ -1919,14 +1919,7 @@ func (c *Container) generateResolvConf() error { // when we add network dns server we also have to add the search domains search = networkSearchDomains // slirp4netns has a built in DNS forwarder. - if c.config.NetMode.IsSlirp4netns() { - slirp4netnsDNS, err := GetSlirp4netnsDNS(c.slirp4netnsSubnet) - if err != nil { - logrus.Warn("Failed to determine Slirp4netns DNS: ", err.Error()) - } else { - nameservers = append(nameservers, slirp4netnsDNS.String()) - } - } + nameservers = c.addSlirp4netnsDNS(nameservers) } if len(c.config.DNSSearch) > 0 || len(c.runtime.config.Containers.DNSSearches) > 0 { @@ -1970,19 +1963,7 @@ func (c *Container) checkForIPv6(netStatus map[string]types.StatusBlock) (bool, } } - if c.config.NetMode.IsSlirp4netns() { - ctrNetworkSlipOpts := []string{} - if c.config.NetworkOptions != nil { - ctrNetworkSlipOpts = append(ctrNetworkSlipOpts, c.config.NetworkOptions["slirp4netns"]...) - } - slirpOpts, err := parseSlirp4netnsNetworkOptions(c.runtime, ctrNetworkSlipOpts) - if err != nil { - return false, err - } - return slirpOpts.enableIPv6, nil - } - - return false, nil + return c.isSlirp4netnsIPv6() } // Add a new nameserver to the container's resolv.conf, ensuring that it is the @@ -2046,16 +2027,8 @@ func (c *Container) getHostsEntries() (etchosts.HostEntries, error) { } entries = etchosts.HostEntries{{IP: ip.String(), Names: names}} default: - // check for net=none - if !c.config.CreateNetNS { - for _, ns := range c.config.Spec.Linux.Namespaces { - if ns.Type == spec.NetworkNamespace { - if ns.Path == "" { - entries = etchosts.HostEntries{{IP: "127.0.0.1", Names: names}} - } - break - } - } + if c.hasNetNone() { + entries = etchosts.HostEntries{{IP: "127.0.0.1", Names: names}} } } return entries, nil |