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: init.sh: rename TUNNEL_MODE variable to TUNNEL_PROTOCOL #24969

Merged

Conversation

julianwiedmann
Copy link
Member

The datapath uses the TUNNEL_MODE macro to determine whether routing is direct or via a tunnel. TUNNEL_MODE is not set in a direct-routing config with ad-hoc tunnel for eg. EgressGW.

The TUNNEL_MODE shell variable in init.sh contains the actual protocol of the tunnel (vxlan or geneve), and is also set for an ad-hoc tunnel.

Avoid any confusion when reading the code, by renaming the shell variable to the more fitting TUNNEL_PROTOCOL. Do the same thing in the agent code that calls the script.

The datapath uses the TUNNEL_MODE macro to determine whether routing is
direct or via a tunnel. TUNNEL_MODE is *not* set in a direct-routing config
with ad-hoc tunnel for eg. EgressGW.

The TUNNEL_MODE shell variable in init.sh contains the actual protocol
of the tunnel (vxlan or geneve), and is also set for an ad-hoc tunnel.

Avoid any confusion when reading the code, by renaming the shell variable
to the more fitting TUNNEL_PROTOCOL. Do the same thing in the agent code
that calls the script.

Signed-off-by: Julian Wiedmann <jwi@isovalent.com>
@julianwiedmann julianwiedmann requested a review from a team as a code owner April 19, 2023 07:23
@maintainer-s-little-helper maintainer-s-little-helper bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Apr 19, 2023
@julianwiedmann julianwiedmann added sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. labels Apr 19, 2023
@maintainer-s-little-helper maintainer-s-little-helper bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Apr 19, 2023
@julianwiedmann
Copy link
Member Author

Small follow-on cleanup, now that #24876 and #24561 are in.

@julianwiedmann
Copy link
Member Author

/test

Copy link
Member

@pchaigno pchaigno left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👌

@pchaigno pchaigno added the kind/cleanup This includes no functional changes. label Apr 19, 2023
Copy link
Contributor

@rgo3 rgo3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹

@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 Apr 19, 2023
@julianwiedmann julianwiedmann merged commit 0aa9e94 into cilium:main Apr 19, 2023
58 checks passed
@julianwiedmann julianwiedmann deleted the 1.14-bpf-init-tunnel-mode branch April 19, 2023 10:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact. sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants