Add the names flag for pod logs

[keonchennl]

Fixes #13261

Signed-off-by: Xueyuan Chen [email protected]

[keonchennl]

I noticed that showing container names in the log was already implemented for container logs, so I just added the same --names flag for pod logs, which resolves this issue #13261.

[rhatdan]

Thanks @keonchennl
A couple of Nits

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: keonchennl, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[keonchennl]

Hi Daniel @rhatdan I am sort of stuck in fixing the pipeline for this PR:
My local test run passes (on ubuntu 20.04) and manual testing also gave the correct result: the container names show up if I run podman pod logs --names testPod.
But the integration tests in the pipeline keep failing on my test case: the container names are even missing in the log with the added "--names" flag.
Could you help have a look at what went wrong?

Below is the result of one of the integration tests (int-podman-ubuntu-2110-rootless-host)

[+0831s] Podman logs
podman pod logs with container names
/var/tmp/go/src/github.com/containers/podman/test/e2e/logs_test.go:418

     [BeforeEach] Podman logs
       /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:33](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L33)
     [It] podman pod logs with container names
       /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:418](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L418)
     $ podman [options] --network-backend cni --storage-driver vfs pod create --name=testPod
     9f637ee52baad9e514102e49d9c3d33df9ddebb1134c12cae7a04839b7466921
     $ podman [options] --network-backend cni --storage-driver vfs run --name container1 -d --pod testPod quay.io/libpod/busybox:latest /bin/sh -c echo log1
     fc75b91a47df22d53817ce5d1f30d1fba840cc9e2767b06c0c857671d194787b
     $ podman [options] --network-backend cni --storage-driver vfs run --name container2 -d --pod testPod quay.io/libpod/busybox:latest /bin/sh -c echo log2
     18de183755f796dc82b4f9ab79111b3feca77a8216ed46c5d22ec8cb535b7bca
     $ podman [options] --network-backend cni --storage-driver vfs pod logs --names testPod
      log2
      log1
     [AfterEach] Podman logs
       /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:45](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L45)
     $ podman [options] --network-backend cni --storage-driver vfs stop -a --time 0
     fc75b91a47df22d53817ce5d1f30d1fba840cc9e2767b06c0c857671d194787b
     18de183755f796dc82b4f9ab79111b3feca77a8216ed46c5d22ec8cb535b7bca
     53c4bf046abb489ed34d72125542a77c40c0310229f3106b03aaee218566f83c
     $ podman [options] --network-backend cni --storage-driver vfs pod stop -a -t 0
     9f637ee52baad9e514102e49d9c3d33df9ddebb1134c12cae7a04839b7466921
     $ podman [options] --network-backend cni --storage-driver vfs pod rm -fa
     9f637ee52baad9e514102e49d9c3d33df9ddebb1134c12cae7a04839b7466921
     $ podman [options] --network-backend cni --storage-driver vfs rm -fa
     "unlinkat /tmp/podman_test312261090/root/vfs/dir/afc1e1000492d3b2af02f16519a85e38822038b68c9ebda54fd6d5272e832617/catatonit: permission denied"
     
     

     • Failure [3.071 seconds]
     Podman logs
     /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:26](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L26)
       podman pod logs with container names [It]
       /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:418](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L418)
     
       Expected
           <[]string | len:2, cap:2>: [" log2", " log1"]
       to contain element matching
           <*matchers.ContainSubstringMatcher | 0xc000a42270>: {Substr: "container1", Args: nil}
     
       /var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:441](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L441)
     
       Full Stack Trace
       github.com/containers/podman/v4/test/e2e.glob..func36.25()
       	/var/tmp/go/src/github.com[/containers/podman/test/e2e/logs_test.go:441](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/logs_test.go#L441) +0x7a2
       github.com/containers/podman/v4/test/e2e.TestLibpod(0x0)
       	/var/tmp/go/src/github.com[/containers/podman/test/e2e/common_test.go:100](https://github.com/containers/podman/blob/d45bc76bd5ec2460a3b4add99b13f8d07deb1937/test/e2e/common_test.go#L100) +0x109
       testing.tRunner(0xc000261040, 0x15f9c78)
       	/usr/local/go/src/testing/testing.go:1259 +0x102
       created by testing.(*T).Run
       	/usr/local/go/src/testing/testing.go:1306 +0x35a

[rhatdan]

Add this patch
patch.txt

[rhatdan]

LGTM other then @TomSweeneyRedHat nit.

[TomSweeneyRedHat]

LGTM other than that nit of a nit

[rhatdan]

/lgtm
/hold

[keonchennl]

It seems some integration test cases get unstable. I'm not sure if the changes cause this. @rhatdan

In last run:

This one was flaky:

[Fail] podman system service verify pprof endpoints [It] are not available

This one failed in int-podman-ubuntu-2110-rootless-host:

[Fail] Podman run with --mac-address flag [It] Podman run --mac-address with custom network

[rhatdan]

/hold cancel