diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-10-13 20:36:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-13 20:36:46 +0200 |
| commit | 6a548df54605366d401ebef74d086c668b722832 (patch) | |
| tree | 79da879b78311cd0cbbfcd4a1681035fb3ff562e /cmd/podman/pods | |
| parent | 3e2d7a992a7a6c1abd09bc519dd20276051bf727 (diff) | |
| parent | 8f603a76f6d7a0a34e5dcb677b8a9e5b87ba0157 (diff) | |
| download | podman-6a548df54605366d401ebef74d086c668b722832.tar.gz podman-6a548df54605366d401ebef74d086c668b722832.tar.bz2 podman-6a548df54605366d401ebef74d086c668b722832.zip | |
Merge pull request #8007 from ashley-cui/formatting
Restore --format: container stats & pod ps
Diffstat (limited to 'cmd/podman/pods')
| -rw-r--r-- | cmd/podman/pods/ps.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cmd/podman/pods/ps.go b/cmd/podman/pods/ps.go index b7952e6e3..0013cca02 100644 --- a/cmd/podman/pods/ps.go +++ b/cmd/podman/pods/ps.go @@ -106,12 +106,13 @@ func pods(cmd *cobra.Command, _ []string) error { } headers := report.Headers(ListPodReporter{}, map[string]string{ - "ContainerIds": "IDS", - "ContainerNames": "NAMES", - "ContainerStatuses": "STATUS", - "Namespace": "NAMESPACES", + "Id": "POD ID", + "Name": "NAME", + "Status": "STATUS", + "Labels": "LABELS", "NumberOfContainers": "# OF CONTAINERS", - "InfraId": "INFRA ID", + "Created": "CREATED", + "InfraID": "INFRA ID", }) row := podPsFormat() if cmd.Flags().Changed("format") { @@ -135,7 +136,7 @@ func pods(cmd *cobra.Command, _ []string) error { } func podPsFormat() string { - row := []string{"{{.Id}}", "{{.Name}}", "{{.Status}}", "{{.Created}}}"} + row := []string{"{{.Id}}", "{{.Name}}", "{{.Status}}", "{{.Created}}", "{{.InfraID}}"} if psInput.CtrIds { row = append(row, "{{.ContainerIds}}") |