Stop turning runners context.Canceled error into nil.

CrunchyData · Dec 7, 2024 · 8dbae3c · 8dbae3c
1 parent 9488662
commit 8dbae3c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/internal/kubernetes/discovery.go b/internal/kubernetes/discovery.go
@@ -196,11 +196,6 @@ func (r *DiscoveryRunner) Start(ctx context.Context) error {
 				log.Error(err, "Unable to detect Kubernetes APIs")
 			}
 		case <-ctx.Done():
-			// TODO(controller-runtime): Fixed in v0.19.0
-			// https://github.com/kubernetes-sigs/controller-runtime/issues/1927
-			if errors.Is(ctx.Err(), context.Canceled) {
-				return nil
-			}
 			return ctx.Err()
 		}
 	}

diff --git a/internal/registration/runner.go b/internal/registration/runner.go
@@ -181,11 +181,6 @@ func (r *Runner) Start(ctx context.Context) error {
 				r.changed()
 			}
 		case <-ctx.Done():
-			// TODO(controller-runtime): Fixed in v0.19.0
-			// https://github.com/kubernetes-sigs/controller-runtime/issues/1927
-			if errors.Is(ctx.Err(), context.Canceled) {
-				return nil
-			}
 			return ctx.Err()
 		}
 	}