mirror of
https://github.com/containers/podman.git
synced 2025-06-17 23:20:59 +08:00
Add support for format {{.Label}}
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:
@ -178,6 +178,11 @@ func (l ListPodReporter) Created() string {
|
||||
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
|
||||
// the number of containers belonging to the pod
|
||||
func (l ListPodReporter) NumberOfContainers() int {
|
||||
|
@ -66,6 +66,7 @@ func GetPods(w http.ResponseWriter, r *http.Request) ([]*entities.ListPodsReport
|
||||
Namespace: pod.Namespace(),
|
||||
Status: status,
|
||||
InfraId: infraId,
|
||||
Labels: pod.Labels(),
|
||||
}
|
||||
for _, ctr := range ctrs {
|
||||
state, err := ctr.State()
|
||||
|
@ -29,6 +29,7 @@ type ListPodsReport struct {
|
||||
Name string
|
||||
Namespace string
|
||||
Status string
|
||||
Labels map[string]string
|
||||
}
|
||||
|
||||
type ListPodContainer struct {
|
||||
|
@ -360,6 +360,7 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
|
||||
Name: p.Name(),
|
||||
Namespace: p.Namespace(),
|
||||
Status: status,
|
||||
Labels: p.Labels(),
|
||||
})
|
||||
}
|
||||
return reports, nil
|
||||
|
@ -243,4 +243,20 @@ var _ = Describe("Podman ps", func() {
|
||||
infra.WaitWithDefaultTimeout()
|
||||
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"))
|
||||
})
|
||||
})
|
||||
|
Reference in New Issue
Block a user