Skip to content

Do not initialize the networking routes when netController is not enabled.#17128

Merged
tiborvass merged 1 commit intomoby:masterfrom
calavera:network_controller_enabled
Oct 19, 2015
Merged

Do not initialize the networking routes when netController is not enabled.#17128
tiborvass merged 1 commit intomoby:masterfrom
calavera:network_controller_enabled

Conversation

@calavera
Copy link
Copy Markdown
Contributor

This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.

This is a better fix than #17036 for windows.

Closes #17036.

/cc @jhowardmsft, @mavenugo

Signed-off-by: David Calavera [email protected]

@lowenna
Copy link
Copy Markdown
Member

lowenna commented Oct 17, 2015

LGTM :)

@thaJeztah
Copy link
Copy Markdown
Member

ping @mavenugo PTAL

@calavera
Copy link
Copy Markdown
Contributor Author

I'm going to make some adjustments here to improve the UX in the client when the networking controller is disabled.

@mavenugo
Copy link
Copy Markdown
Contributor

LGTM.

This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.

Signed-off-by: David Calavera <[email protected]>
@calavera calavera force-pushed the network_controller_enabled branch from 0afdc0b to eb982e7 Compare October 19, 2015 18:41
@calavera calavera changed the title Do not initialize the networking router when netController is not enabled. Do not initialize the networking routes when netController is not enabled. Oct 19, 2015
@calavera
Copy link
Copy Markdown
Contributor Author

I made a change to return a nicer message to the user. This is what happens when the network controller is not initialized:

➜  docker network ls
Error response from daemon: the network controller is not enabled for this platform

@lowenna
Copy link
Copy Markdown
Member

lowenna commented Oct 19, 2015

Nice! Still LGTM

@calavera calavera added this to the 1.9.0 milestone Oct 19, 2015
@tiborvass
Copy link
Copy Markdown
Contributor

LGTM

tiborvass added a commit that referenced this pull request Oct 19, 2015
Do not initialize the networking routes when netController is not enabled.
@tiborvass tiborvass merged commit 82a8a14 into moby:master Oct 19, 2015
@calavera calavera deleted the network_controller_enabled branch October 19, 2015 20:13
@tiborvass tiborvass removed their assignment Oct 22, 2015
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.

6 participants