Skip to content

[23.0 backport] daemon: set docker0 subpool as the IPAM pool#45403

Merged
thaJeztah merged 1 commit intomoby:23.0from
akerouanton:23.0-cherrypick-2d31697
Apr 26, 2023
Merged

[23.0 backport] daemon: set docker0 subpool as the IPAM pool#45403
thaJeztah merged 1 commit intomoby:23.0from
akerouanton:23.0-cherrypick-2d31697

Conversation

@akerouanton
Copy link
Copy Markdown
Member

@akerouanton akerouanton commented Apr 26, 2023 •
edited by thaJeztah
Loading

Backport:

Note that the original commit incriminated by the message of the cherry-picked commit is not present in branch 23.0. However it's been cherry-picked too, by the following PR (commit 063d3a6):

- Description for the changelog

Fix a regression introduced in v23.0.4 where dockerd would refuse to start if the fixed-cidr config parameter is provided but not bip.

- A picture of a cute animal (not mandatory but encouraged)

@akerouanton
daemon: set docker0 subpool as the IPAM pool
227d3f3 
Since cc19eba (backported to v23.0.4), the PreferredPool for docker0 is
set only when the user provides the bip config parameter or when the
default bridge already exist. That means, if a user provides the
fixed-cidr parameter on a fresh install or reboot their computer/server
without bip set, dockerd throw the following error when it starts:

> failed to start daemon: Error initializing network controller: Error
> creating default "bridge" network: failed to parse pool request for
> address space "LocalDefault" pool "" subpool "100.64.0.0/26": Invalid
> Address SubPool

See moby#45356.

Signed-off-by: Albin Kerouanton <[email protected]>
(cherry picked from commit 2d31697)
Signed-off-by: Albin Kerouanton <[email protected]>
@akerouanton akerouanton marked this pull request as ready for review April 26, 2023 09:49
@thaJeztah thaJeztah added this to the 23.0.5 milestone Apr 26, 2023
thaJeztah
thaJeztah approved these changes Apr 26, 2023
View reviewed changes
Copy link
Copy Markdown
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
Copy link
Copy Markdown
Member

thaJeztah commented Apr 26, 2023

Failures on Windows (both with containerd enabled and not);

=== Failed
=== FAIL: github.com/docker/docker/integration-cli TestDockerCLIPushSuite/TestPushToCentralRegistryUnauthorized (50.59s)
    docker_cli_push_test.go:229: assertion failed: strings.Contains(out, "Retrying") is true
    --- FAIL: TestDockerCLIPushSuite/TestPushToCentralRegistryUnauthorized (50.59s)

=== FAIL: github.com/docker/docker/integration-cli TestDockerCLIPushSuite (100.98s)

@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Apr 26, 2023

^^ above issue was due to an issue with Docker Hub, and was resolved

@thaJeztah thaJeztah merged commit 9af6762 into moby:23.0 Apr 26, 2023
@akerouanton akerouanton deleted the 23.0-cherrypick-2d31697 branch April 26, 2023 17:35
@thaJeztah thaJeztah mentioned this pull request Apr 26, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@vvoland vvoland vvoland approved these changes

@cpuguy83 cpuguy83 Awaiting requested review from cpuguy83

Assignees

No one assigned

Labels

area/daemon Core Engine area/networking Networking area/testing impact/changelog kind/bugfix PR's that fix bugs status/2-code-review

Projects

None yet

Milestone

23.0.5

Development

Successfully merging this pull request may close these issues.

3 participants

@akerouanton @thaJeztah @vvoland