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.

Sign up for GitHub

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

Jump to bottom

datapath: Support enable-endpoint-routes with encapsulation #13346

Merged
merged 1 commit into from Sep 30, 2020
Merged

datapath: Support enable-endpoint-routes with encapsulation #13346

merged 1 commit into from Sep 30, 2020

Conversation

tgraf
Copy link
Member

@tgraf tgraf commented Sep 30, 2020

It is reasonable to support encapsulation with enable-endpoint-routes.
The existing code derived a new datapath mode when
enable-endpoint-routes was enabled, which automatically disabled
encapsulation.

@tgraf
datapath: Support enable-endpoint-routes with encapsulation
81d81e9 
It is reasonable to support encapsulation with enable-endpoint-routes.
The existing code derived a new datapath mode when
enable-endpoint-routes was enabled, which automatically disabled
encapsulation.

Signed-off-by: Thomas Graf <thomas@cilium.io>
@tgraf tgraf added kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. needs-backport/1.8 labels Sep 30, 2020
@tgraf tgraf requested a review from a team September 30, 2020 14:09
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.8.4 Sep 30, 2020
errordeveloper
errordeveloper approved these changes Sep 30, 2020
View reviewed changes
Copy link
Contributor

@errordeveloper errordeveloper left a comment

Choose a reason for hiding this comment

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

LGTM, but a code-owner should definitely review this as well :)

@tgraf tgraf mentioned this pull request Sep 30, 2020
Closed
@tgraf
Copy link
Member Author

tgraf commented Sep 30, 2020

test-me-please

fristonio
fristonio approved these changes Sep 30, 2020
View reviewed changes
Copy link
Member

@fristonio fristonio left a comment •
edited

Choose a reason for hiding this comment

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

LGTM.
I saw this draft PR. Tagging @mrostecki here so this doesn't get missed.

@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 Sep 30, 2020
@tgraf tgraf added the sig/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. label Sep 30, 2020
vadorovsky
vadorovsky approved these changes Sep 30, 2020
View reviewed changes
Copy link
Member

@vadorovsky vadorovsky left a comment

Choose a reason for hiding this comment

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

LGTM. Thanks for cc-ing me @fristonio! 🚀

@joestringer joestringer removed this from Needs backport from master in 1.8.4 Sep 30, 2020
@joestringer joestringer added this to Needs backport from master in 1.8.5 Sep 30, 2020
@joestringer joestringer merged commit 3179a47 into master Sep 30, 2020
@joestringer joestringer deleted the pr/tgraf/endpoint-routes-encap branch September 30, 2020 23:53
@errordeveloper errordeveloper mentioned this pull request Oct 2, 2020
Merged
@errordeveloper errordeveloper mentioned this pull request Oct 5, 2020
Merged
errordeveloper added a commit that referenced this pull request Oct 7, 2020
@errordeveloper
datapath: Fix handling of enable-endpoint-routes
b9f1a48 
When #13346 was backported to v1.8 branch this case hasn't been
patched correctly due difference betwen v1.8 and master.

Fixes: b8a0f01 ("datapath: Support enable-endpoint-routes with encapsulation")

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
@errordeveloper errordeveloper mentioned this pull request Oct 7, 2020
Merged
gandro pushed a commit that referenced this pull request Oct 8, 2020
@errordeveloper @gandro
datapath: Fix handling of enable-endpoint-routes
c0b79e6 
When #13346 was backported to v1.8 branch this case hasn't been
patched correctly due difference betwen v1.8 and master.

Fixes: b8a0f01 ("datapath: Support enable-endpoint-routes with encapsulation")

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
@pchaigno pchaigno mentioned this pull request Oct 8, 2020
Merged
@tklauser tklauser moved this from Needs backport from master to Backport done to v1.8 in 1.8.5 Oct 13, 2020
@aditighag aditighag mentioned this pull request Oct 20, 2020
Closed
@christarazi christarazi mentioned this pull request Oct 28, 2020
Merged
@pchaigno pchaigno mentioned this pull request Feb 9, 2021
Merged
@pchaigno pchaigno mentioned this pull request Nov 23, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@errordeveloper errordeveloper errordeveloper approved these changes

@tklauser tklauser tklauser approved these changes

@joestringer joestringer joestringer approved these changes

@fristonio fristonio fristonio approved these changes

@vadorovsky vadorovsky vadorovsky approved these changes

Assignees
No one assigned
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.5
Backport done to v1.8
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tgraf @errordeveloper @tklauser @joestringer @fristonio @vadorovsky