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

daemon: remove Daemon.NetworkControllerEnabled #49052

Merged

Conversation

thaJeztah
Copy link
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 <github@gone.nl>
@thaJeztah thaJeztah added this to the 28.0.0 milestone Dec 8, 2024
@thaJeztah thaJeztah self-assigned this Dec 8, 2024
Comment on lines 717 to +718
distributionrouter.NewRouter(opts.daemon.ImageBackend()),
network.NewRouter(opts.daemon, opts.cluster),
Copy link
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
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
161 checks passed
@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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants