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

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

Merged
merged 1 commit into from Apr 26, 2023

Conversation

akerouanton
Copy link
Member

@akerouanton akerouanton commented Apr 26, 2023

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)

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 <albinker@gmail.com>
(cherry picked from commit 2d31697)
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
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
Copy link
Member

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
Member

^^ 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
87 checks passed
@akerouanton akerouanton deleted the 23.0-cherrypick-2d31697 branch April 26, 2023 17:35
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