Check for swarm-mode network conflict during create network #24431
Conversation
GordonTheTurtle
added
status/0-triage
dco/no
This reverts commit 0ce5158. Signed-off-by: Madhu Venugopal <madhu@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
GordonTheTurtle
removed
the
dco/no
mavenugo
changed the title
|
@mavenugo can you clarify the situation? The issue this pr is supposed to fix, is already closed. Should we reopen it? |
|
@tiborvass #24158 solves #23983. But along with the correct patch, I incorrectly added another fix which caused an issue wherein a service fails if it has multiple networks. With this PR, am retaining just the fix that is required to solve #23983, but removing the incorrect patch that is causing the breakage. |
|
LGTM |
|
Should we have a test? |
|
@thaJeztah since this involves swarm-mode & there is a bigger effort on introducing proper IT for swarm-mode, I was hoping to add it as part of that. Will that work ? |
|
alright, as long as we don't forget LGTM |
|
@tiborvass just to confirm ... the Cherry-pick should only be done on the the commit : 6a4b21b . The other one is a revert and hence it can be safely ignored. |
|
@mavenugo it's automated so it will cherrypick both. |
Reverts #24158 which causes service create to fail if it is attached to multiple networks. We need to find another better way to handle the case of failing network connect/disconnect for managed containers.
Fixes #23983