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

IPv6 related refactoring #48248

Merged
merged 4 commits into from
Jul 29, 2024
Merged

IPv6 related refactoring #48248

merged 4 commits into from
Jul 29, 2024

Conversation

robmry
Copy link
Contributor

@robmry robmry commented Jul 26, 2024 •
edited
Loading

- What I did

  • Add IPv6 to the null IPAM driver
    • It doesn't need to treat IPv4/IPv6 differently (and this means I'll be able to use it in a test for IPv6-only).
  • Trivial tidy-up of Endpoint.assignAddress()
    • Make the error flow the same for IPv4/IPv6.
  • Remove code to update Network.enableIPv6 if false
    • Dead code that I had to think about for IPv6-only.
  • Use retErr in Endpoint.sbJoin
    • Return value err was shadowed by err in the function, a bit confusing.
    • (not IPv6-specific, but I need to make further changes to the function for IPv6-only)

- How I did it

- How to verify it

- Description for the changelog

n/a

@robmry
Add IPv6 to the null IPAM driver
6fe26e0 
Signed-off-by: Rob Murray <[email protected]>
@robmry
Trivial tidy-up of Endpoint.assignAddress()
8f19895 
Signed-off-by: Rob Murray <[email protected]>
@robmry
Remove code to update Network.enableIPv6 if false
58808e7 
Commit 4b9dc64 (from 2016) added this in response to a
review comment, but I don't think it can ever have worked
because n.enableIPv6 = netMap["enableIPv6"].(bool), added
in 2015, would already have panic'd if the field wasn't
stored.

In any case, it's no longer needed.

Signed-off-by: Rob Murray <[email protected]>
@robmry
Use retErr in Endpoint.sbJoin
ef8e2fe 
Signed-off-by: Rob Murray <[email protected]>
@robmry robmry added area/networking kind/refactor PR's that refactor, or clean-up code labels Jul 26, 2024
@robmry robmry self-assigned this Jul 26, 2024
thaJeztah
thaJeztah approved these changes Jul 29, 2024
View reviewed changes
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

@thaJeztah thaJeztah merged commit 32c33db into moby:master Jul 29, 2024
141 checks passed
@thaJeztah thaJeztah added the area/networking/ipv6 Issues related to ipv6 label Jul 29, 2024
@thaJeztah thaJeztah added this to the 28.0.0 milestone Jul 29, 2024
@thaJeztah thaJeztah mentioned this pull request Aug 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@akerouanton akerouanton akerouanton approved these changes

@thaJeztah thaJeztah thaJeztah approved these changes

Assignees

@robmry robmry

Labels
area/networking/ipv6 Issues related to ipv6 area/networking kind/refactor PR's that refactor, or clean-up code
Projects
None yet
Milestone
28.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@robmry @akerouanton @thaJeztah