Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bpf: Set DIRECT_ROUTING_DEV* in routed mode #11419

Merged
merged 1 commit into from May 8, 2020

Conversation

brb
Copy link
Member

@brb brb commented May 8, 2020

This commits drop the check for the mode if the NodePort BPF is enabled, which allows DIRECT_ROUTING_DEV* to be set in the "routed" mode (--enable-endpoint-routes=true).

Previously, due to the check the NodePort BPF was broken with --enable-endpoint-routes=true, and the direct routing mode "direct" can be used together with "routed" (both modes are sharing the same variable).

/cc @pchaigno

Fix: c5bcce4 ("datapath: Use direct routing iface for fwding NodePort requests")

This commits drop the check for the mode if the NodePort BPF is enabled,
which allows DIRECT_ROUTING_DEV* to be set in the "routed" mode
(--enable-endpoint-routes=true). Previously, the NodePort BPF was broken
with --enable-endpoint-routes=true.

Fix: c5bcce4 ("datapath: Use direct routing iface for fwding NodePort requests")
Signed-off-by: Martynas Pumputis <m@lambda.lt>
@brb brb added kind/bug This is a bug in the Cilium logic. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. labels May 8, 2020
@brb brb requested review from borkmann and a team May 8, 2020 09:50
@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

2 similar comments
@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

@maintainer-s-little-helper
Copy link

Please set the appropriate release note label.

@brb
Copy link
Member Author

brb commented May 8, 2020

test-me-please

@coveralls
Copy link

Coverage Status

Coverage increased (+0.002%) to 37.854% when pulling 2de17d4 on pr/brb/fix-direct-routing-mode into 6d364cd on master.

@maintainer-s-little-helper maintainer-s-little-helper bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 8, 2020
@borkmann borkmann merged commit f7d6c8a into master May 8, 2020
1.8.0 automation moved this from In progress to Merged May 8, 2020
@borkmann borkmann deleted the pr/brb/fix-direct-routing-mode branch May 8, 2020 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
No open projects
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

None yet

4 participants