fix: context cancellation handling (#22824)

sivchari · web-flow · commit 61b3ea1187b2 · 2025-06-08T14:10:46.000-04:00
Signed-off-by: sivchari &lt;shibuuuu5@gmail.com&gt;
diff --git a/pkg/apiclient/apiclient.go b/pkg/apiclient/apiclient.go
@@ -849,7 +849,7 @@ func (c *client) WatchApplicationWithRetry(ctx context.Context, appName string,
 }
 
 func isCanceledContextErr(err error) bool {
-	if err != nil && errors.Is(err, context.Canceled) {
+	if err != nil && errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
 		return true
 	}
 	if stat, ok := status.FromError(err); ok {

Original file line number	Diff line number	Diff line change
`@@ -849,7 +849,7 @@ func (c *client) WatchApplicationWithRetry(ctx context.Context, appName string,`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`func isCanceledContextErr(err error) bool {`
`852`		`- if err != nil && errors.Is(err, context.Canceled) {`
	`852`	`+ if err != nil && errors.Is(err, context.Canceled) \|\| errors.Is(err, context.DeadlineExceeded) {`
`853`	`853`	`return true`
`854`	`854`	`}`
`855`	`855`	`if stat, ok := status.FromError(err); ok {`