proxy: Do not panic on local error #25969
Merged
Conversation
This file contains 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
CreateOrUpdateRedirect called nil revertFunc when any local error was returned. This was done using the pattern `return 0, err, nil, nil` which sets the revertFunc return variable as nil, but this was called on a deferred function to revert any changes on a local error. Fix this by calling ReverStack.Revert() directly on the deferred function, and setting the return variable if there was no local error. This was hit any time a CiliumNetworkPolicy referred to a non-existing listener. Add a test case that reproduced the panic and works after the fix. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
jrajahalme
added
kind/bug
Only update an existing redirect if it is configured. This prevents Cilium agent panic when trying to update redirect with released proxy port. This has only been observed to happen with explicit Envoy listener redirects in CiliumNetworkPolicy when the listener has been removed. Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Increment non-DNS proxy ports on failure even if DNS has been configured with a static port. Fixes: cilium#20896 Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
|
/test |
maintainer-s-little-helper
bot
added
the
ready-to-merge
pchaigno
added
backport-pending/1.13
michi-covalent
added
backport-done/1.13
michi-covalent
moved this from Backport pending to v1.13
to Backport done to v1.13
in 1.13.4
This was referenced Jun 13, 2023
jrajahalme
removed
the
needs-backport/1.13
|
Added |
7 tasks
maintainer-s-little-helper
bot
moved this from Needs backport from main
to Backport pending to v1.11
in 1.11.18
10 tasks
tklauser
added
backport-done/1.11
maintainer-s-little-helper
bot
moved this from Backport pending to v1.11
to Backport done to v1.11
in 1.11.18
tklauser
added
backport-done/1.12
This was referenced Jul 26, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
CreateOrUpdateRedirect called nil revertFunc when any local error was returned. This was done using the pattern
return 0, err, nil, nilwhich sets the revertFunc return variable as nil, but this was called on a deferred function to revert any changes on a local error.Fix this by calling ReverStack.Revert() directly on the deferred function, and setting the return variable if there was no local error.
Another panic was possible when updating an existing redirect the proxy port of which had been released. Check that the proxy port is initialized before reusing the (possibly stale) redirect.
This was hit any time a CiliumNetworkPolicy referred to a non-existing listener.
Add a test case that reproduced the panic and works after the fix.
Increment proxy port on failure for non-DNS ports, even if DNS has been configured with a static port.