fix: timeoutSignal is lost after being overriden with controller.signal

[sachiniyer]

I believe that the watch timeout abort signal was getting overwritten, and I think 0ae5ddf just forgot to delete line 44.

I wrote a one-off test to make sure this was really happening, but please let me know if I should be adding a unit test for this functionality as part of this PR.

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: sachiniyer
Once this PR has been reviewed and has the lgtm label, please assign mstruebing for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

• OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[cjihrig]

I wrote a one-off test to make sure this was really happening, but please let me know if I should be adding a unit test for this functionality as part of this PR.

That would be very helpful!

[sachiniyer]

Hi @cjihrig !

I've added a previously failing test. If you add back the line that I deleted, you will see that the test hangs/times out.

I also made the timeout value a private instance property to make it more easily testable - hopefully that's alright.

[cjihrig]

Mostly LGTM, thanks.

[sachiniyer]

Made both adjustments @cjihrig

Lmk if anything else looks off.