[17.09] Adding ipam options to ipam driver requests #2455
Merged
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
Currently ipam options doesnt seem to be passed to remote ipam drivers. Remote ipam drivers that depend on any driver specific options will not work if ipam options are not included in the RequestAddress fromthe swarm manager to allocate IPs. This is minor fix to pass the ipam options to ipam drivers. Signed-off-by: Abhinandan Prativadi <[email protected]> (cherry picked from commit ed271d4) Signed-off-by: Sebastiaan van Stijn <[email protected]>
This commit contains fix to serialize IPAM and Port allocation. This would fix transient issues seen due to immediate resource release. Signed-off-by: Abhinandan Prativadi <[email protected]> (cherry picked from commit fe0d7f6) Signed-off-by: Sebastiaan van Stijn <[email protected]>
|
Failing test is known to me to be flaky. Otherwise, LGTM, I'll kick off a rebuild. |
anshulpundir
approved these changes
Nov 29, 2017
nishanttotla
approved these changes
Dec 1, 2017
Codecov Report
@@ Coverage Diff @@
## bump_v17.09 #2455 +/- ##
===============================================
+ Coverage 60.2% 61.38% +1.18%
===============================================
Files 128 128
Lines 26170 24008 -2162
===============================================
- Hits 15755 14738 -1017
+ Misses 9033 7890 -1143
+ Partials 1382 1380 -2 |
|
It's green now, so potentially for rc2 |
|
@thaJeztah should I merge it right now then, or do you want to wait? |
|
@thaJeztah is it fine to merge this one? |
|
hm; looks like I missed your earlier comment. We missed this one for 17.09.1; guess it doesn't hurt to merge it here, then we can open a vendor-bump in the https://github.com/docker/docker-ce repo in case there will be a 17.09.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in 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.
Backport of #2324 for 17.09
ping @abhi @anshulpundir @mavenugo PTAL