From a0ab45d62737d653d2e6465e5fcc7cd6d308b7a1 Mon Sep 17 00:00:00 2001
From: mueslo <mueslo@mueslo.de>
Date: Mon, 23 Feb 2026 13:46:09 +0100
Subject: [PATCH] fix: prevent failure when test pod contains multiple
 containers

Signed-off-by: mueslo <mueslo@mueslo.de>
---
 pkg/action/release_testing.go      | 53 +++++++++++++++++++++++++-----
 pkg/action/release_testing_test.go |  2 +-
 2 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/pkg/action/release_testing.go b/pkg/action/release_testing.go
index 043a41236..6d69b4072 100644
--- a/pkg/action/release_testing.go
+++ b/pkg/action/release_testing.go
@@ -25,6 +25,7 @@ import (
 	"time"
 
 	v1 "k8s.io/api/core/v1"
+    metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	chartutil "helm.sh/helm/v4/pkg/chart/v2/util"
 	"helm.sh/helm/v4/pkg/kube"
@@ -135,17 +136,53 @@ func (r *ReleaseTesting) GetPodLogs(out io.Writer, rel *release.Release) error {
 				if len(r.Filters[IncludeNameFilter]) > 0 && !slices.Contains(r.Filters[IncludeNameFilter], h.Name) {
 					continue
 				}
-				req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, &v1.PodLogOptions{})
-				logReader, err := req.Stream(context.Background())
+				// Fetch logs per-container for pods with multiple containers to avoid
+				// the "a container name must be specified" error.
+				pod, err := client.CoreV1().Pods(r.Namespace).Get(context.Background(), h.Name, metav1.GetOptions{})
 				if err != nil {
-					return fmt.Errorf("unable to get pod logs for %s: %w", h.Name, err)
+					return fmt.Errorf("unable to get pod %s: %w", h.Name, err)
 				}
 
-				fmt.Fprintf(out, "POD LOGS: %s\n", h.Name)
-				_, err = io.Copy(out, logReader)
-				fmt.Fprintln(out)
-				if err != nil {
-					return fmt.Errorf("unable to write pod logs for %s: %w", h.Name, err)
+				var firstErr error
+				containers := pod.Spec.Containers
+				if len(containers) == 1 {
+					req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, &v1.PodLogOptions{})
+					logReader, err := req.Stream(context.Background())
+					if err != nil {
+						return fmt.Errorf("unable to get pod logs for %s: %w", h.Name, err)
+					}
+
+					fmt.Fprintf(out, "POD LOGS: %s\n", h.Name)
+					_, err = io.Copy(out, logReader)
+					fmt.Fprintln(out)
+					if err != nil {
+						return fmt.Errorf("unable to write pod logs for %s: %w", h.Name, err)
+					}
+				} else {
+					for _, c := range containers {
+						opts := &v1.PodLogOptions{Container: c.Name}
+						req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, opts)
+						logReader, err := req.Stream(context.Background())
+						if err != nil {
+							if firstErr == nil {
+								firstErr = fmt.Errorf("unable to get logs for pod %s container %s: %w", h.Name, c.Name, err)
+							}
+							continue
+						}
+
+						fmt.Fprintf(out, "POD LOGS: %s (container: %s)\n", h.Name, c.Name)
+						_, err = io.Copy(out, logReader)
+						fmt.Fprintln(out)
+						if err != nil {
+							if firstErr == nil {
+								firstErr = fmt.Errorf("unable to write logs for pod %s container %s: %w", h.Name, c.Name, err)
+							}
+						}
+					}
+
+					if firstErr != nil {
+						return firstErr
+					}
 				}
 			}
 		}
diff --git a/pkg/action/release_testing_test.go b/pkg/action/release_testing_test.go
index ab35e104a..a334c7844 100644
--- a/pkg/action/release_testing_test.go
+++ b/pkg/action/release_testing_test.go
@@ -89,7 +89,7 @@ func TestReleaseTestingGetPodLogs_PodRetrievalError(t *testing.T) {
 		},
 	}
 
-	require.ErrorContains(t, client.GetPodLogs(&bytes.Buffer{}, &release.Release{Hooks: hooks}), "unable to get pod logs")
+	require.ErrorContains(t, client.GetPodLogs(&bytes.Buffer{}, &release.Release{Hooks: hooks}), "unable to get pod")
 }
 
 func TestReleaseTesting_WaitOptionsPassedDownstream(t *testing.T) {