opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-17 23:20:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for format {{.Label}}

Browse Source 
the pod ps man page says .Label is valid go template format. i dont think the function was actually ever implemented.

Fixes #6448

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude
2020-06-01 09:43:45 -05:00
parent f559cec6c0
commit 990514ea92
5 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/pods/ps.go
View File

@ -178,6 +178,11 @@ func (l ListPodReporter) Created() string {
return units.HumanDuration(time.Since(l.ListPodsReport.Created)) + " ago" return units.HumanDuration(time.Since(l.ListPodsReport.Created)) + " ago"
} }
// Labels returns a map of the pod's labels
func (l ListPodReporter) Labels() map[string]string {
return l.ListPodsReport.Labels
}
// NumberofContainers returns an int representation for // NumberofContainers returns an int representation for
// the number of containers belonging to the pod // the number of containers belonging to the pod
func (l ListPodReporter) NumberOfContainers() int { func (l ListPodReporter) NumberOfContainers() int {

1
pkg/api/handlers/utils/pods.go
View File

@ -66,6 +66,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
Namespace: pod.Namespace(), Namespace: pod.Namespace(),
Status: status, Status: status,
InfraId: infraId, InfraId: infraId,
Labels: pod.Labels(),
} }
for _, ctr := range ctrs { for _, ctr := range ctrs {
state, err := ctr.State() state, err := ctr.State()

1
pkg/domain/entities/pods.go
View File

@ -29,6 +29,7 @@ type ListPodsReport struct {
Name string Name string
Namespace string Namespace string
Status string Status string
Labels map[string]string
} }
type ListPodContainer struct { type ListPodContainer struct {

1
pkg/domain/infra/abi/pods.go
View File

@ -360,6 +360,7 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
Name: p.Name(), Name: p.Name(),
Namespace: p.Namespace(), Namespace: p.Namespace(),
Status: status, Status: status,
Labels: p.Labels(),
}) })
} }
return reports, nil return reports, nil

16
test/e2e/pod_ps_test.go
View File

@ -243,4 +243,20 @@ var _ = Describe("Podman ps", func() {
infra.WaitWithDefaultTimeout() infra.WaitWithDefaultTimeout()
Expect(len(infra.OutputToString())).To(BeZero()) Expect(len(infra.OutputToString())).To(BeZero())
}) })
It("podman pod ps format with labels", func() {
_, ec, _ := podmanTest.CreatePod("")
Expect(ec).To(Equal(0))
_, ec1, _ := podmanTest.CreatePodWithLabels("", map[string]string{
"io.podman.test.label": "value1",
"io.podman.test.key": "irrelevant-value",
})
Expect(ec1).To(Equal(0))
session := podmanTest.Podman([]string{"pod", "ps", "--format", "{{.Labels}}"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
Expect(session.OutputToString()).To(ContainSubstring("value1"))
})
}) })