1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
moby--moby/daemon/cluster
Yong Tang 20a7e39728 Fix missing IPAM options in swarm network mode
This fix tries to fix the issue raised in 29044 where
the IPAM options is missing in swarm network mode
after the service is deployed. Before the service
is deployed, the IPAM options is available.

The reason for the issue is that, before service is
deployed, `network inspect` is querying the swarm and
obtained the correct information.
However, after service is deployed, swarm executor
does not pass the IPAM options to the backend (daemon).
Also after service is deployed, `network inspect` is
actually querying the local daemon for information.
At this time the network information with missing IPAM
options is returned.

This fix fixes the issue by updating the swarm network
allocator and swarm executor.

A separate PR for swarmkit will be opened.

An integration test has been added to cover the change.

This fix fixes 29044.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 4d958e99c1)
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-12-12 13:26:30 -08:00
..
convert Fix issue where TmpfsOptions are not sent to swarm 2016-12-02 13:43:02 -08:00
executor Fix missing IPAM options in swarm network mode 2016-12-12 13:26:30 -08:00
provider Add engine-api types to docker 2016-09-07 11:05:58 -07:00
cluster.go Don't resolve or pull images referenced by ID 2016-11-30 14:11:43 -08:00
filters.go secrets: secret management for swarm 2016-11-09 14:27:43 -05:00
helpers.go Fix spelling in comments, strings and documentation 2016-07-03 20:58:11 +03:00
listen_addr.go Reject unspecified advertise addr on swarm init 2016-11-29 14:12:45 -08:00
listen_addr_linux.go Add fallback to resolveSystemAddr() in linux 2016-09-09 13:27:57 -07:00
listen_addr_others.go Add functional support for Docker sub commands on Solaris 2016-11-07 09:06:34 -08:00
listen_addr_solaris.go Add functional support for Docker sub commands on Solaris 2016-11-07 09:06:34 -08:00
secrets.go judge manager before getting secret 2016-11-14 11:54:29 -08:00