Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: (TKC-2164) valid container executor exit code handling #5614

Merged
merged 3 commits into from
Jul 2, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pkg/executor/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -560,7 +560,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) &&
exu marked this conversation as resolved.
Show resolved Hide resolved
(containerStatus.State.Terminated.Message != "" || containerStatus.State.Terminated.Reason != "") {
if message != "" {
message += "\n"
Expand Down
Loading