IPv6 only: bug fix - enableIPv4 for old networks#48489
Merged
robmry merged 1 commit intomoby:masterfrom Sep 17, 2024
Merged
Conversation
The new Network.enableIPv4 flag needs to be set for IPv4 networks created before it was introduced. Commit 903daa4 attempted to do that in the unmarshalling code by checking Network.ipamV4Info - but, that field hadn't been unmarshalled yet, so it was never present. Instead, check for its presence in the saved map. Signed-off-by: Rob Murray <[email protected]>
robmry
added
area/networking
Member
|
@robmry this is the one we need backported? |
Member
|
oh, probably not because we didn't include the related change? (#48343) |
Contributor
Author
Yes, exactly - only a few IPv6 only changes are in master, the rest of are in the review queue. So they don't do anything useful yet. (And I think they'll need to end up in a major release.) |
akerouanton
approved these changes
Sep 12, 2024
corhere
approved these changes
Sep 17, 2024
18 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
- What I did
Fix a bug introduced in:
- How I did it
The new
Network.enableIPv4flag needs to be set for IPv4 networks created before it was introduced.Commit 903daa4 attempted to do that in the unmarshalling code by checking
Network.ipamV4Info- but, that field hadn't been unmarshalled yet, so it was never present.Instead, check for its presence in the saved map.
- How to verify it
Create a bridge network with moby 27.x, update to a version built from master, start a container on the IPv4 network - see that the daemon doesn't crash (the bridge code can't yet cope with
!enableIpv4).- Description for the changelog