Merge 312e80e4c2 into 5534c01cdb

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"
@@ -127,13 +128,28 @@ 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{})
+
+				podLogOptions := &v1.PodLogOptions{}
+
+				pod, err := client.CoreV1().Pods(r.Namespace).Get(context.Background(), h.Name, metav1.GetOptions{})
+				if err != nil {
+					return errors.Wrapf(err, "unable to get pod info for %s", h.Name)
+				}
+
+				if container, ok := pod.Annotations["kubectl.kubernetes.io/default-container"]; ok {
+					podLogOptions.Container = container
+				}
+
+				req := client.CoreV1().Pods(r.Namespace).GetLogs(h.Name, 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)
+				if len(podLogOptions.Container) > 0 {
+					fmt.Fprintf(out, "CONTAINER: %s\n", podLogOptions.Container)
+				}
 				_, err = io.Copy(out, logReader)
 				fmt.Fprintln(out)
 				if err != nil {