From 63ee265e38c6194e573d541bb0d6cdc0e241f386 Mon Sep 17 00:00:00 2001
From: Will Thames <will@thames.id.au>
Date: Fri, 13 Oct 2023 22:40:53 +1000
Subject: [PATCH] Don't error if log reconnection fails due to context canceled
 (#875)

Co-authored-by: AaronH88 <aaronharrison@hotmail.com>
---
 pkg/workceptor/kubernetes.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkg/workceptor/kubernetes.go b/pkg/workceptor/kubernetes.go
index 14d277b0d..14c279139 100644
--- a/pkg/workceptor/kubernetes.go
+++ b/pkg/workceptor/kubernetes.go
@@ -239,6 +239,14 @@ func (kw *kubeUnit) kubeLoggingWithReconnect(streamWait *sync.WaitGroup, stdout
 		for *stdinErr == nil { // check between every line read to see if we need to stop reading
 			line, err := streamReader.ReadString('\n')
 			if err != nil {
+				if kw.ctx.Err() == context.Canceled {
+					kw.Info(
+						"Context was canceled while reading logs for pod %s/%s. Assuming pod has finished",
+						podNamespace,
+						podName)
+
+					return
+				}
 				kw.Info(
 					"Detected Error: %s for pod %s/%s. Will retry %d more times.",
 					err,