diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-20 10:16:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 10:16:19 -0400 |
| commit | bd711358525b09ebc4cb49094a674700b87f7ec0 (patch) | |
| tree | 4795a0bc656fb8e36121438fcac2c379cb8ed3dd /libpod/pod_api.go | |
| parent | 02c2fbc4cd72524dfa65ba36bddfd5c4076a9512 (diff) | |
| parent | 838df56bcf960edb81d7a26250278298d4997e55 (diff) | |
| download | podman-bd711358525b09ebc4cb49094a674700b87f7ec0.tar.gz podman-bd711358525b09ebc4cb49094a674700b87f7ec0.tar.bz2 podman-bd711358525b09ebc4cb49094a674700b87f7ec0.zip | |
Merge pull request #5890 from sujil02/v2-pod-inspect-fix
Update pod inspect report to hold current pod status.
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index ed4dc0727..45aa5cb8d 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -446,6 +446,7 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { if err != nil { return nil, err } + ctrStatuses := make(map[string]define.ContainerStatus, len(containers)) for _, c := range containers { containerStatus := "unknown" // Ignoring possible errors here because we don't want this to be @@ -459,12 +460,18 @@ func (p *Pod) Inspect() (*define.InspectPodData, error) { Name: c.Name(), State: containerStatus, }) + ctrStatuses[c.ID()] = c.state.State + } + podState, err := CreatePodStatusResults(ctrStatuses) + if err != nil { + return nil, err } inspectData := define.InspectPodData{ ID: p.ID(), Name: p.Name(), Namespace: p.Namespace(), Created: p.CreatedTime(), + State: podState, Hostname: "", Labels: p.Labels(), CreateCgroup: false, |