aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-09-24 16:51:28 -0400
committerGitHub <noreply@github.com>2021-09-24 16:51:28 -0400
commite19a09c3dfb90e12078e0af4ca2cfc45677c6d68 (patch)
tree3dea7ab26a62d0e0e9167be985e8761fb9ab3cdc
parent5b88e8ba82c22dc7f39f11d5e12538a4e440d85f (diff)
parent1e0039a839ea019a43fe21feb7658a2c0b5e3099 (diff)
downloadpodman-e19a09c3dfb90e12078e0af4ca2cfc45677c6d68.tar.gz
podman-e19a09c3dfb90e12078e0af4ca2cfc45677c6d68.tar.bz2
podman-e19a09c3dfb90e12078e0af4ca2cfc45677c6d68.zip
Merge pull request #11609 from sankalp-r/add-healthcheck-ps
added healthcheck to ps command
-rw-r--r--cmd/podman/containers/ps.go4
-rw-r--r--pkg/ps/ps.go7
-rw-r--r--test/e2e/healthcheck_run_test.go5
3 files changed, 16 insertions, 0 deletions
diff --git a/cmd/podman/containers/ps.go b/cmd/podman/containers/ps.go
index afb8edd91..9687cd5bd 100644
--- a/cmd/podman/containers/ps.go
+++ b/cmd/podman/containers/ps.go
@@ -375,6 +375,10 @@ func (l psReporter) State() string {
// Status is a synonym for State()
func (l psReporter) Status() string {
+ hc := l.ListContainer.Status
+ if hc != "" {
+ return l.State() + " (" + hc + ")"
+ }
return l.State()
}
diff --git a/pkg/ps/ps.go b/pkg/ps/ps.go
index bf3286028..0f154c524 100644
--- a/pkg/ps/ps.go
+++ b/pkg/ps/ps.go
@@ -241,6 +241,13 @@ func ListContainerBatch(rt *libpod.Runtime, ctr *libpod.Container, opts entities
UTS: uts,
}
}
+
+ if hc, err := ctr.HealthCheckStatus(); err == nil {
+ ps.Status = hc
+ } else {
+ logrus.Debug(err)
+ }
+
return ps, nil
}
diff --git a/test/e2e/healthcheck_run_test.go b/test/e2e/healthcheck_run_test.go
index 2826f2b34..b2666c789 100644
--- a/test/e2e/healthcheck_run_test.go
+++ b/test/e2e/healthcheck_run_test.go
@@ -80,6 +80,11 @@ var _ = Describe("Podman healthcheck run", func() {
time.Sleep(1 * time.Second)
}
Expect(exitCode).To(Equal(0))
+
+ ps := podmanTest.Podman([]string{"ps"})
+ ps.WaitWithDefaultTimeout()
+ Expect(ps).Should(Exit(0))
+ Expect(ps.OutputToString()).To(ContainSubstring("(healthy)"))
})
It("podman healthcheck that should fail", func() {