From 69b25f8b82192bd32d833af567b61e099bc0317c Mon Sep 17 00:00:00 2001
From: Lubron Zhan <lubronzhan@gmail.com>
Date: Wed, 7 Jan 2026 13:23:45 -0800
Subject: [PATCH] Report pod.status.message when pod fails

Signed-off-by: Lubron Zhan <lubronzhan@gmail.com>
---
 pkg/util/kube/pod.go      |  4 ++++
 pkg/util/kube/pod_test.go | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkg/util/kube/pod.go b/pkg/util/kube/pod.go
index 86aa2e47b5..34b9655fae 100644
--- a/pkg/util/kube/pod.go
+++ b/pkg/util/kube/pod.go
@@ -184,6 +184,10 @@ func GetPodTerminateMessage(pod *corev1api.Pod) string {
 		}
 	}
 
+	if pod.Status.Message != "" {
+		message += pod.Status.Message + "/"
+	}
+
 	return message
 }
 
diff --git a/pkg/util/kube/pod_test.go b/pkg/util/kube/pod_test.go
index ba930019e9..e47c9d501b 100644
--- a/pkg/util/kube/pod_test.go
+++ b/pkg/util/kube/pod_test.go
@@ -520,6 +520,27 @@ func TestGetPodTerminateMessage(t *testing.T) {
 			},
 			message: "message-1/message-2/message-3/",
 		},
+		{
+			name: "with pod status message",
+			pod: &corev1api.Pod{
+				Status: corev1api.PodStatus{
+					Message: "pod-message",
+				},
+			},
+			message: "pod-message/",
+		},
+		{
+			name: "with termination and pod status message",
+			pod: &corev1api.Pod{
+				Status: corev1api.PodStatus{
+					ContainerStatuses: []corev1api.ContainerStatus{
+						{Name: "container-1", State: corev1api.ContainerState{Terminated: &corev1api.ContainerStateTerminated{Message: "message-1"}}},
+					},
+					Message: "pod-message",
+				},
+			},
+			message: "message-1/pod-message/",
+		},
 	}
 
 	for _, test := range tests {