[v1.13.1] Cherry-Pick [#1875]: Fix issue in service update of published ports in host mode #1910
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fix tries to fix the issue in docker/docker/30199 where service update will not work when published ports is host publish mode. The reason for the issue is that `isPortsAllocated()` does not capture host publish mode. This fix address the issue by updating allocated ports if there is any change in ports of host (non ingress) mode as well. Unit tests have been added. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit adds the `allocatedPorts` for cherry-pick. The `allocatedPorts` was added in PR moby#1835, which is not part of the v1.13.1 cherry pick. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
|
/cc @aaronlehmann @thaJeztah this PR is for v1.13.1 of moby/moby#30199 |
|
LGTM |
|
/cc @dongluochen @aboch |
|
looks good to me |
|
LGTM |
|
Merging. Thanks all! |
yongtang
added a commit
to yongtang/docker
that referenced
this pull request
Jan 30, 2017
…dd3eff5526e This fix cherry-pick SwarmKit update to 0af40501a9cc98cd3e9425d2e4246dd3eff5526e for branch 1.13.x. The following has been added: - [moby/swarmkit#1909]: raft: Disable address change detection - [moby/swarmkit#1910]: Fix issue in service update of published ports in host mode This fix fixes moby#30199 in docker. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request is for cherry-pick of #1875 to v1.13.1:
[#1875]: Fix issue in service update of published ports in host mode
In additional to the above cherry-picked PR, this PR also includes a fix up with
allocatedPortsdefinition. TheallocatedPortswas added in #1835 which is not part of the v1.13.1.Signed-off-by: Yong Tang yong.tang.github@outlook.com