Skip to content

fix: handle context errors as transient errors #6850

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.

Sign up for GitHub

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

Merged
guydc merged 12 commits into from
Aug 28, 2025
Merged

fix: handle context errors as transient errors #6850

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f2f9564
handle context errors as transient errors
TomerJLevy Aug 26, 2025
d39172b
add test cases
TomerJLevy Aug 26, 2025
f313174
no need the new line
TomerJLevy Aug 26, 2025
ebbb2a7
add release notes
TomerJLevy Aug 27, 2025
07fdfd4
Return the error as is
TomerJLevy Aug 27, 2025
cef326d
Merge branch 'main' into patch-2
TomerJLevy Aug 27, 2025
bf936a5
revert redundant changes
TomerJLevy Aug 27, 2025
e3183c1
revert unrelated changes
TomerJLevy Aug 27, 2025
90f8559
revert more changes...
TomerJLevy Aug 27, 2025
06b3b41
Merge branch 'main' into patch-2
zirain Aug 27, 2025
652aaf5
Merge branch 'main' into patch-2
TomerJLevy Aug 28, 2025
807bc4d
Merge branch 'main' into patch-2
TomerJLevy Aug 28, 2025
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: 3 additions & 1 deletion internal/provider/kubernetes/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ func isTransientError(err error) bool {
kerrors.IsServiceUnavailable(err) ||
kerrors.IsStoreReadError(err) ||
kerrors.IsInternalError(err) ||
kerrors.IsUnexpectedServerError(err)
kerrors.IsUnexpectedServerError(err) ||
errors.Is(err, context.Canceled) ||
errors.Is(err, context.DeadlineExceeded)
}

// Reconcile handles reconciling all resources in a single call. Any resource event should enqueue the
Expand Down
10 changes: 10 additions & 0 deletions internal/provider/kubernetes/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1603,6 +1603,12 @@ func TestIsTransientError(t *testing.T) {
serviceUnavailableErr := kerrors.NewServiceUnavailable("service unavailable")
badRequestErr := kerrors.NewBadRequest("bad request")

// new test errors for context
canceledErr := context.Canceled
deadlineExceededErr := context.DeadlineExceeded
wrappedCanceledErr := fmt.Errorf("wrapped: %w", context.Canceled)
wrappedDeadlineExceededErr := fmt.Errorf("wrapped: %w", context.DeadlineExceeded)

testCases := []struct {
name string
err error
Expand All @@ -1614,6 +1620,10 @@ func TestIsTransientError(t *testing.T) {
{"ServiceUnavailable", serviceUnavailableErr, true},
{"BadRequest", badRequestErr, false},
{"NilError", nil, false},
{"ContextCanceled", canceledErr, true},
{"ContextDeadlineExceeded", deadlineExceededErr, true},
{"WrappedContextCanceled", wrappedCanceledErr, true},
{"WrappedContextDeadlineExceeded", wrappedDeadlineExceededErr, true},
}

for _, tc := range testCases {
Expand Down