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

Adds ipv6 support for local-router-ip #15662

Merged
merged 1 commit into from
Apr 15, 2021
Merged

Adds ipv6 support for local-router-ip #15662

merged 1 commit into from
Apr 15, 2021

Conversation

Weil0ng
Copy link
Contributor

@Weil0ng Weil0ng commented Apr 12, 2021 •
edited

  • breaks local-router-ip into local-router-ipv4 and local-router-ipv6
  • removes a problematic ipam condition check when either of the above is
    specified

original option added in PR #14800

Signed-off-by: Weilong Cui cuiwl@google.com

@Weil0ng Weil0ng requested a review from a team April 12, 2021 22:05
@Weil0ng Weil0ng requested a review from a team as a code owner April 12, 2021 22:05
@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 12, 2021
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.10.0 Apr 12, 2021
@Weil0ng Weil0ng added the release-note/misc This PR makes changes that have no direct user impact. label Apr 12, 2021
@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 12, 2021
@Weil0ng Weil0ng requested a review from twpayne April 13, 2021 01:03
@Weil0ng
Adds ipv6 support for local-router-ip
95db15d 
- breaks local-router-ip into local-router-ipv4 and local-router-ipv6
- removes a problematic ipam condition check when either of the above is
specified

Signed-off-by: Weilong Cui <cuiwl@google.com>
twpayne
twpayne approved these changes Apr 13, 2021
View reviewed changes
Copy link
Contributor

@twpayne twpayne left a comment

Choose a reason for hiding this comment

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

LGTM. As the original --local-router-ip flag was introduced after 1.9 was released and therefore hasn't been part of a stable release, I think it's OK to remove the old flag completely.

@Weil0ng
Copy link
Contributor Author

Weil0ng commented Apr 13, 2021

test-me-please

@Weil0ng
Copy link
Contributor Author

Weil0ng commented Apr 13, 2021

failure seems unrelated, retesting 4.9

@Weil0ng
Copy link
Contributor Author

Weil0ng commented Apr 13, 2021

retest-4.9

@Weil0ng
Copy link
Contributor Author

Weil0ng commented Apr 15, 2021

friendly ping :)

@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 15, 2021
@qmonnet qmonnet merged commit 9ba1151 into cilium:master Apr 15, 2021
1.10.0 automation moved this from In progress to Done Apr 15, 2021
@nbusseneau nbusseneau mentioned this pull request Apr 19, 2021
Closed
This was referenced Apr 28, 2021
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twpayne twpayne twpayne approved these changes

@nathanjsweet nathanjsweet nathanjsweet approved these changes

Assignees

@twpayne twpayne

@nathanjsweet nathanjsweet

Labels
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.
Projects
No open projects
1.10.0
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@Weil0ng @twpayne @nathanjsweet @aanm @qmonnet