From 61c29eb5e7864383478e9c50e94830baa3541191 Mon Sep 17 00:00:00 2001 From: Akshay Mankar Date: Tue, 31 Jan 2023 12:10:03 +0100 Subject: [PATCH] Ensure `helm test --logs` only gets logs from pods Signed-off-by: Akshay Mankar --- pkg/action/release_testing.go | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go index ecaeaf59f..197dd83c8 100644 --- a/pkg/action/release_testing.go +++ b/pkg/action/release_testing.go @@ -108,19 +108,21 @@ func (r *ReleaseTesting) GetPodLogs(out io.Writer, rel *release.Release) error { } for _, h := range rel.Hooks { - for _, e := range h.Events { - if e == release.HookTest { - req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, &v1.PodLogOptions{}) - logReader, err := req.Stream(context.Background()) - if err != nil { - return errors.Wrapf(err, "unable to get pod logs for %s", h.Name) - } - - fmt.Fprintf(out, "POD LOGS: %s\n", h.Name) - _, err = io.Copy(out, logReader) - fmt.Fprintln(out) - if err != nil { - return errors.Wrapf(err, "unable to write pod logs for %s", h.Name) + if h.Kind == "Pod" { + for _, e := range h.Events { + if e == release.HookTest { + req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, &v1.PodLogOptions{}) + logReader, err := req.Stream(context.Background()) + if err != nil { + return errors.Wrapf(err, "unable to get pod logs for %s", h.Name) + } + + fmt.Fprintf(out, "POD LOGS: %s\n", h.Name) + _, err = io.Copy(out, logReader) + fmt.Fprintln(out) + if err != nil { + return errors.Wrapf(err, "unable to write pod logs for %s", h.Name) + } } } }