From 990514ea92b9b50dfb95dc0e505e11a21578a649 Mon Sep 17 00:00:00 2001 From: Brent Baude Date: Mon, 1 Jun 2020 09:43:45 -0500 Subject: 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 --- pkg/api/handlers/utils/pods.go | 1 + pkg/domain/entities/pods.go | 1 + pkg/domain/infra/abi/pods.go | 1 + 3 files changed, 3 insertions(+) (limited to 'pkg') diff --git a/pkg/api/handlers/utils/pods.go b/pkg/api/handlers/utils/pods.go index fb795fa6a..5b6f6d34d 100644 --- a/pkg/api/handlers/utils/pods.go +++ b/pkg/api/handlers/utils/pods.go @@ -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() diff --git a/pkg/domain/entities/pods.go b/pkg/domain/entities/pods.go index 1a38a7aa4..37acba6e6 100644 --- a/pkg/domain/entities/pods.go +++ b/pkg/domain/entities/pods.go @@ -29,6 +29,7 @@ type ListPodsReport struct { Name string Namespace string Status string + Labels map[string]string } type ListPodContainer struct { diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go index 16c222cbd..320880920 100644 --- a/pkg/domain/infra/abi/pods.go +++ b/pkg/domain/infra/abi/pods.go @@ -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 -- cgit v1.2.3-54-g00ecf