diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-12-02 19:28:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 19:28:48 +0100 |
| commit | 4ff0ba4c8731e3dc1d56010f80468260104f3abc (patch) | |
| tree | 897ede56e699e7f39ad5aa949851bf7fd11ea3c3 /cmd/podman/pods/stats.go | |
| parent | ee39281c35e3ceca98c0c51c9cc5d792c56ba533 (diff) | |
| parent | 61792de36ea2ea98f6e3aef3821d1b15beebf9e0 (diff) | |
| download | podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.tar.gz podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.tar.bz2 podman-4ff0ba4c8731e3dc1d56010f80468260104f3abc.zip | |
Merge pull request #12455 from jwhonce/issues/10974
Refactor podman image command output
Diffstat (limited to 'cmd/podman/pods/stats.go')
| -rw-r--r-- | cmd/podman/pods/stats.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cmd/podman/pods/stats.go b/cmd/podman/pods/stats.go index ba2c1495b..a7bba3064 100644 --- a/cmd/podman/pods/stats.go +++ b/cmd/podman/pods/stats.go @@ -67,9 +67,7 @@ func stats(cmd *cobra.Command, args []string) error { return err } - row := report.NormalizeFormat(statsOptions.Format) - doJSON := report.IsJSON(row) - + doJSON := report.IsJSON(cmd.Flag("format").Value.String()) headers := report.Headers(entities.PodStatsReport{}, map[string]string{ "CPU": "CPU %", "MemUsage": "MEM USAGE/ LIMIT", @@ -96,6 +94,8 @@ func stats(cmd *cobra.Command, args []string) error { goterm.Flush() } if cmd.Flags().Changed("format") { + row := report.NormalizeFormat(statsOptions.Format) + row = report.EnforceRange(row) if err := printFormattedPodStatsLines(headers, row, reports); err != nil { return err } @@ -143,8 +143,6 @@ func printFormattedPodStatsLines(headerNames []map[string]string, row string, st return nil } - row = report.EnforceRange(row) - tmpl, err := report.NewTemplate("stats").Parse(row) if err != nil { return err |