-
Notifications
You must be signed in to change notification settings - Fork 615
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[17.09] Adding ipam options to ipam driver requests #2455
Conversation
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. |
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 |
Backport of #2324 for 17.09
ping @abhi @anshulpundir @mavenugo PTAL