From 4ea47e9c9ee647969eaacd13d09629f6714f6857 Mon Sep 17 00:00:00 2001 From: Jacek Wysocki Date: Thu, 27 Jun 2024 07:59:43 +0200 Subject: [PATCH 1/2] fix: valid container exit code handling --- pkg/executor/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/executor/common.go b/pkg/executor/common.go index 33720f81d90..b8cc1e3eb0c 100644 --- a/pkg/executor/common.go +++ b/pkg/executor/common.go @@ -557,7 +557,7 @@ func GetPodErrorMessage(ctx context.Context, client kubernetes.Interface, pod *c for _, containerStatus := range pod.Status.ContainerStatuses { if containerStatus.State.Terminated != nil && - (containerStatus.State.Terminated.ExitCode > 1 || containerStatus.State.Terminated.ExitCode < -1) && + (containerStatus.State.Terminated.ExitCode >= 1 || containerStatus.State.Terminated.ExitCode < -1) && (containerStatus.State.Terminated.Message != "" || containerStatus.State.Terminated.Reason != "") { if message != "" { message += "\n" From 98a759f8544e29333ae5aeac5421202aacfcd125 Mon Sep 17 00:00:00 2001 From: Jacek Wysocki Date: Tue, 2 Jul 2024 10:40:30 +0200 Subject: [PATCH 2/2] fix: handle container executor exit code --- pkg/executor/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/executor/common.go b/pkg/executor/common.go index d4c2e7edc94..df812dc91e9 100644 --- a/pkg/executor/common.go +++ b/pkg/executor/common.go @@ -545,7 +545,7 @@ func GetPodErrorMessage(ctx context.Context, client kubernetes.Interface, pod *c for _, initContainerStatus := range pod.Status.InitContainerStatuses { if initContainerStatus.State.Terminated != nil && - (initContainerStatus.State.Terminated.ExitCode > 1 || initContainerStatus.State.Terminated.ExitCode < -1) && + (initContainerStatus.State.Terminated.ExitCode >= 1 || initContainerStatus.State.Terminated.ExitCode < -1) && (initContainerStatus.State.Terminated.Message != "" || initContainerStatus.State.Terminated.Reason != "") { if message != "" { message += "\n"