diff options
author | Doug Rabson <dfr@rabson.org> | 2022-09-09 11:07:00 +0100 |
---|---|---|
committer | Doug Rabson <dfr@rabson.org> | 2022-09-12 16:28:36 +0100 |
commit | 2bf050f1d1f39c3587fc98f9d66d0faa57cbd5f0 (patch) | |
tree | 85cfd5f0c214b9ca6934a77e596e284a6e3fe42b /libpod/networking_freebsd.go | |
parent | 3d7f9f67a7fc07f5cba11a58f29ef824eccf3dc1 (diff) | |
download | podman-2bf050f1d1f39c3587fc98f9d66d0faa57cbd5f0.tar.gz podman-2bf050f1d1f39c3587fc98f9d66d0faa57cbd5f0.tar.bz2 podman-2bf050f1d1f39c3587fc98f9d66d0faa57cbd5f0.zip |
libpod: Move setUpNetwork and getCNIPodName to networking_common.go
[NO NEW TESTS NEEDED]
Signed-off-by: Doug Rabson <dfr@rabson.org>
Diffstat (limited to 'libpod/networking_freebsd.go')
-rw-r--r-- | libpod/networking_freebsd.go | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go index 9daa15b25..16c941767 100644 --- a/libpod/networking_freebsd.go +++ b/libpod/networking_freebsd.go @@ -121,24 +121,6 @@ func (r *Runtime) setupNetNS(ctr *Container) error { return errors.New("not implemented (*Runtime) setupNetNS") } -// setUpNetwork will set up the the networks, on error it will also tear down the cni -// networks. If rootless it will join/create the rootless network namespace. -func (r *Runtime) setUpNetwork(ns string, opts types.NetworkOptions) (map[string]types.StatusBlock, error) { - return r.network.Setup(ns, types.SetupOptions{NetworkOptions: opts}) -} - -// getCNIPodName return the pod name (hostname) used by CNI and the dnsname plugin. -// If we are in the pod network namespace use the pod name otherwise the container name -func getCNIPodName(c *Container) string { - if c.config.NetMode.IsPod() || c.IsInfra() { - pod, err := c.runtime.state.Pod(c.PodID()) - if err == nil { - return pod.Name() - } - } - return c.Name() -} - // Create and configure a new network namespace for a container func (r *Runtime) configureNetNS(ctr *Container, ctrNS *jailNetNS) (status map[string]types.StatusBlock, rerr error) { if err := r.exposeMachinePorts(ctr.config.PortMappings); err != nil { |