Skip to content

daemon: remove Daemon.NetworkControllerEnabled#49052

Merged
akerouanton merged 1 commit intomoby:masterfrom
thaJeztah:remove_daemon_NetworkControllerEnabled
Dec 9, 2024
Merged

daemon: remove Daemon.NetworkControllerEnabled#49052
akerouanton merged 1 commit intomoby:masterfrom
thaJeztah:remove_daemon_NetworkControllerEnabled

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

This function was added in eb982e7, at which time networking was not yet implemented for Windows, resulting in a panic when trying to call network-related endpoints.

That's no longer the case, so we should be able to add network-endpoints unconditionally.

This function was added in eb982e7, at
which time networking was not yet implemented for Windows, resulting
in a panic when trying to call network-related endpoints.

That's no longer the case, so we should be able to add network-endpoints
unconditionally.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added area/api API status/2-code-review area/networking Networking area/daemon Core Engine kind/refactor PR's that refactor, or clean-up code labels Dec 8, 2024
@thaJeztah thaJeztah added this to the 28.0.0 milestone Dec 8, 2024
@thaJeztah thaJeztah self-assigned this Dec 8, 2024
Comment thread cmd/dockerd/daemon.go
Comment on lines 717 to +718
distributionrouter.NewRouter(opts.daemon.ImageBackend()),
network.NewRouter(opts.daemon, opts.cluster),
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This line will conflict with #49051, so depending on which one gets merged first may require a rebase / conflict fix

Copy link
Copy Markdown
Member

@akerouanton akerouanton left a comment

Choose a reason for hiding this comment

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

Thanks!

@akerouanton akerouanton merged commit f1bb2bc into moby:master Dec 9, 2024
@thaJeztah thaJeztah deleted the remove_daemon_NetworkControllerEnabled branch December 9, 2024 10:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/api API area/daemon Core Engine area/networking Networking kind/refactor PR's that refactor, or clean-up code status/2-code-review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants