Merge pull request #8203 from Luap99/fix-8194

Fix dnsname when joining a different network namespace in a pod

2 files changed, 11 insertions, 17 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)
 
diff --git a/libpod/rootless_cni_linux.go b/libpod/rootless_cni_linux.go
index 21e43ebd0..3d4ff6e86 100644
--- a/libpod/rootless_cni_linux.go
+++ b/libpod/rootless_cni_linux.go
@@ -53,7 +53,7 @@ func AllocRootlessCNI(ctx context.Context, c *Container) (ns.NetNS, []*cnitypes.
 	if err != nil {
 		return nil, nil, err
 	}
-	k8sPodName := getPodOrContainerName(c) // passed to CNI as K8S_POD_NAME
+	k8sPodName := getCNIPodName(c) // passed to CNI as K8S_POD_NAME
 	cniResults := make([]*cnitypes.Result, len(c.config.Networks))
 	for i, nw := range c.config.Networks {
 		cniRes, err := rootlessCNIInfraCallAlloc(infra, c.ID(), nw, k8sPodName)
@@ -115,12 +115,16 @@ func getRootlessCNIInfraLock(r *Runtime) (lockfile.Locker, error) {
 	return lockfile.GetLockfile(fname)
 }
 
-func getPodOrContainerName(c *Container) string {
-	pod, err := c.runtime.GetPod(c.PodID())
-	if err != nil || pod.config.Name == "" {
-		return c.Name()
+// 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.GetPod(c.PodID())
+		if err == nil {
+			return pod.Name()
+		}
 	}
-	return pod.config.Name
+	return c.Name()
 }
 
 func rootlessCNIInfraCallAlloc(infra *Container, id, nw, k8sPodName string) (*cnitypes.Result, error) {