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

[20.10 backport] Only check if route overlaps routes with scope: LINK #43360

Merged

Conversation

Nossnevs
Copy link

Backport this PR #42598 to be able to use Docker with VPN services in current major version of Docker.

closes #41525
partially addresses #33925
According to original PR.

Signed-off-by: Mikael Svensson mikael.svensson@nasdaq.com

- What I did
Backport #42598 to 20.10.x
- How I did it
Used the change from above PR. I did not however find the test setup that main branch had. Did not add the test change because of that.
- How to verify it
I have not been able to verify it in 20.10.x branch

- Description for the changelog
#41525 Only check if route overlaps routes with scope LINK. Fixes problems with some VPN clients.

@Nossnevs
Copy link
Author

Would be good if this could be included in 20.10.13.

@thaJeztah thaJeztah changed the title Only check if route overlaps routes with scope: LINK [20.10 backport] Only check if route overlaps routes with scope: LINK Mar 11, 2022
@thaJeztah thaJeztah added the status/failing-ci Indicates that the PR in its current state fails the test suite label Mar 11, 2022
@thaJeztah thaJeztah added status/2-code-review area/networking status/needs-vendoring and removed status/failing-ci Indicates that the PR in its current state fails the test suite labels Mar 15, 2022
@thaJeztah thaJeztah added this to the 20.10.14 milestone Mar 15, 2022
Signed-off-by: Mikael Svensson <mikael.svensson@nasdaq.com>
@Nossnevs Nossnevs force-pushed the backport-21.x-linux-routeoverlaps-link-only-42598 branch from 8618a54 to 2825bf7 Compare March 17, 2022 08:54
@Nossnevs Nossnevs requested a review from tianon as a code owner March 17, 2022 08:54
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM, thx!

@Nossnevs
Copy link
Author

@thaJeztah Do you have any estimate when 20.10.14 is going to be released?

@thaJeztah
Copy link
Member

No, I don't have an estimate yet, but will discuss with other maintainers 👍

@thaJeztah
Copy link
Member

@Nossnevs hi! sorry for the wait; as you may have seen, we were working on a 20.10.14 release for a (minor) security issue, which is why this wasn't included in the 20.10.14 release. 20.10.15 will be a "regular" patch release, so we'll be merging back ports into this branch for that release; I don't have a date yet for that patch release, but we'll be collecting patches in the branch and do a release in the near future.

I'll ask for other maintainers to give a review, so that we can merge this one 👍

@thaJeztah thaJeztah modified the milestones: 20.10.14, 20.10.15 Mar 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants