watcher: Fix K8sWatcher.FindPod #3409
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
added
the
release-note/bug
The K8sWatcher.FindPod method first tries to find a pod using index, then, if unsuccessful, falls back to walking the entire pods list. This fallback was incorrect - fix it. I'm not sure how often or if ever this code path was being hit in the wild - it would be hit only if the index got out-of-sync. It would be good to understand it, but for now let's just fix the bug. Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
ghost
marked this pull request as ready for review
✅ Deploy Preview for tetragon ready!
To edit notification comments on pull requests, go to your Netlify site configuration. |
Author
|
I suppose walking the pod list might be applicable only if using In any case, the code looks clearly incorrect and no tests have caught it, so seems worth fixing. |
TestFindPodWalk would fail before the preceding commit fixing a bug in the fallback pod lookup. Signed-off-by: Anna Kapuscinska <anna@isovalent.com>
kkourt
approved these changes
Mar 21, 2025
Contributor
kkourt
left a comment
kkourt
left a comment
There was a problem hiding this comment.
Nice catch, thanks!
I introduced the bug in: 175c591.
AFAICT, it was a typo and I ended using up the global variable (podIdx) instead of the argument (podID).
175c591#diff-29ab67ad2861533ba7cfc10ed9d527f12a57b27cae23c566d373d82027c8f4c6R167-R177
I guess at some point the argument was removed.
I'll mark this PR for backports.
kkourt
added
needs-backport/1.2
This was referenced Mar 21, 2025
ghost
added
backport-pending/1.2
ghost
added
backport-done/1.3
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The K8sWatcher.FindPod method first tries to find a pod using index, then, if
unsuccessful, falls back to walking the entire pods list. This fallback was
incorrect - fix it.
I'm not sure how often or if ever this code path was being hit in the wild - it
would be hit only if the index got out-of-sync. It would be good to understand
it, but for now let's just fix the bug.