[1.17] bpf: always mark decrypted wireguard traffic#39498
Closed
Conversation
maintainer-s-little-helper
bot
added
backport/1.17
Contributor
Author
|
/test |
rgo3
changed the title
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
16ae59e to
1d4a784
Compare
Contributor
Author
|
/ci-e2e-upgrade |
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
1d4a784 to
0cbeb8a
Compare
Contributor
Author
|
/ci-e2e-upgrade |
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
15a7414 to
a2b2070
Compare
Contributor
Author
|
/ci-e2e-upgrade |
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
a2b2070 to
450f889
Compare
Contributor
Author
|
/test |
smagnani96
approved these changes
Jun 5, 2025
Contributor
smagnani96
left a comment
smagnani96
left a comment
There was a problem hiding this comment.
Thanks Robin. Left a couple of comments for reviewers, feel free to solve them when needed 😃
| // Cleanup also calls map from v1.18 after downgrade. | ||
| cleanCallsMaps(fmt.Sprintf("cilium_calls_wireguard_%d", device.Attrs().Index)) | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
For reviewers: all this logic is not needed anymore, as it will always be executed in attachNetworkDevices() in case WG is enabled. In case it is disabled it is not needed: the interface has been teared down.
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
450f889 to
942bf73
Compare
Contributor
Author
|
/test |
To always mark decrypted wireguard traffic we need to always attach cil_from_netdev to the wireguard device, which is changed in this commit. This is needed for upgrade scenarios, where a future version of cilium (1.18) expects this mark to be there. Signed-off-by: Robin Gögge <[email protected]>
rgo3
force-pushed
the
pr/rgo3/1.17-wg-ingress-mark
branch
from
942bf73 to
7f1fb0b
Compare
Contributor
Author
|
/test |
Contributor
Author
|
This isn't needed anymore since #39239 didn't make it into 1.18 |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
This PR is a manual backport needed for #39239. This is needed for upgrade scenarios, where a future version of cilium (1.18) expects this mark to be there. To achieve this, we always need to attach
cil_from_netdevto the wireguard device. AsNeedBPFHostOnWireGuardDevicethen becomes obsolete, we remove it entirely from the code base.