Skip to content

windows: do not forgot IPAM configuration when re-creating networks#50649

Merged
robmry merged 1 commit intomoby:masterfrom
olljanat:win-keep-ipam-config
Aug 7, 2025
Merged

windows: do not forgot IPAM configuration when re-creating networks#50649
robmry merged 1 commit intomoby:masterfrom
olljanat:win-keep-ipam-config

Conversation

@olljanat
Copy link
Contributor

@olljanat olljanat commented Aug 6, 2025

- What I did
I seems to be that no one else has actually tried to build production ready IPAM plugin for Windows because reloading of them has been broken since from original implementation #20478

So I updated network re-creation logic in way that we keep track which IPAM driver was used and what the options where used.

- How I did it
Storing old values to variables before removing old networks. Only exception is the case when network exists only in HNS but not in Docker. In that case we expect that it was created outside of Docker and mark IPAM driver to default (which get replaced with windows somewhere else in code) like old behavior was.

- How to verify it
CI should pass just fine because this does not change old behavior.

Actual IPAM plugin reloading cannot be tested in latest code in master branch until bug IPAM plugin loading is broken in Windows starting from Docker 27.0.1 is fixed but those who are interested can try my custom release 26.1.5-olljanat2.

- Human readable description for the release notes

- Windows: when restoring networks on daemon restart, preserve their association with non-default IPAM drivers

@olljanat
Copy link
Contributor Author

olljanat commented Aug 6, 2025

@robmry I think that you have worked in this area lately so PTAL

Copy link
Contributor

@robmry robmry left a comment

Choose a reason for hiding this comment

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

LGTM

@akerouanton akerouanton modified the milestones: 29.0, 29.0.0 Aug 7, 2025
@robmry
Copy link
Contributor

robmry commented Aug 7, 2025

Something tragic's happening in CI at the moment - but the test failures here (on Linux) can't be related to the changes. So, let's get this merged ...

@robmry robmry merged commit e628fa0 into moby:master Aug 7, 2025
367 of 375 checks passed
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.

3 participants