summaryrefslogtreecommitdiff
path: root/libpod/networking_linux.go
diff options
context:
space:
mode:
authorPaul Holzinger <paul.holzinger@web.de>2020-10-30 15:38:54 +0100
committerPaul Holzinger <paul.holzinger@web.de>2020-10-30 18:53:55 +0100
commit2704dfbb7a3fc079a74e9c8edf1acd7be24db035 (patch)
treedbe13f6e55f1e466850c4e25ddb8326cad04c40a /libpod/networking_linux.go
parent228396a99dc88fc828f23d4072a46ca8de90282f (diff)
downloadpodman-2704dfbb7a3fc079a74e9c8edf1acd7be24db035.tar.gz
podman-2704dfbb7a3fc079a74e9c8edf1acd7be24db035.tar.bz2
podman-2704dfbb7a3fc079a74e9c8edf1acd7be24db035.zip
Fix dnsname when joining a different network namespace in a pod
When creating a container in a pod the podname was always set as the dns entry. This is incorrect when the container is not part of the pods network namespace. This happend both rootful and rootless. To fix this check if we are part of the pods network namespace and if not use the container name as dns entry. Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod/networking_linux.go')
-rw-r--r--libpod/networking_linux.go12
1 files changed, 1 insertions, 11 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index 9ff6e40b7..28dca8dd8 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -102,17 +102,7 @@ func (r *Runtime) configureNetNS(ctr *Container, ctrNS ns.NetNS) ([]*cnitypes.Re
requestedMAC = ctr.config.StaticMAC
}
- // If we are in a pod use the pod name for the network, otherwise the container name
- var podName string
- if ctr.PodID() != "" {
- pod, err := r.GetPod(ctr.PodID())
- if err == nil {
- podName = pod.Name()
- }
- }
- if podName == "" {
- podName = ctr.Name()
- }
+ podName := getCNIPodName(ctr)
podNetwork := r.getPodNetwork(ctr.ID(), podName, ctrNS.Path(), ctr.config.Networks, ctr.config.PortMappings, requestedIP, requestedMAC)