-
Notifications
You must be signed in to change notification settings - Fork 616
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
[19.03 backport] Remove hardcoded IPAM config subnet value for ingress network #2891
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
arkodg
changed the title
Remove hardcoded IPAM config subnet value for ingress network
[19.03 backport] Remove hardcoded IPAM config subnet value for ingress network
Sep 10, 2019
Fixes: https://docker.atlassian.net/browse/ENGORC-2651 (cherry picked from commit 9ccb20b) Signed-off-by: Arko Dasgupta <[email protected]>
PTAL @dperny @thaJeztah |
Codecov Report
@@ Coverage Diff @@
## bump_v19.03 #2891 +/- ##
===============================================
+ Coverage 62.22% 62.23% +0.01%
===============================================
Files 139 139
Lines 22320 22311 -9
===============================================
- Hits 13888 13886 -2
+ Misses 6956 6944 -12
- Partials 1476 1481 +5 |
thaJeztah
approved these changes
Sep 17, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, thanks!
thaJeztah
added a commit
to thaJeztah/docker
that referenced
this pull request
Sep 19, 2019
full diff: moby/swarmkit@bbe3418...f35d910 changes included: - moby/swarmkit#2891 [19.03 backport] Remove hardcoded IPAM config subnet value for ingress network - backport of moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network Signed-off-by: Sebastiaan van Stijn <[email protected]>
docker-jenkins
pushed a commit
to docker-archive/docker-ce
that referenced
this pull request
Sep 20, 2019
full diff: moby/swarmkit@bbe3418...f35d910 changes included: - moby/swarmkit#2891 [19.03 backport] Remove hardcoded IPAM config subnet value for ingress network - backport of moby/swarmkit#2890 Remove hardcoded IPAM config subnet value for ingress network - fixes [ENGORC-2651] Specifying --default-addr-pool for docker swarm init is not picked up by ingress network Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 02465c9f9da4064211d0f7e56a8c93a567589713 Component: engine
Merged
3 tasks
arkodg
pushed a commit
to arkodg/moby
that referenced
this pull request
Oct 10, 2019
1) Includes: moby/swarmkit#2891 2) Edited TestServiceWithDefaultAddressPoolInit to validate dynamic ingress network subnet Signed-off-by: Arko Dasgupta <[email protected]>
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 #2890
Fixes: https://docker.atlassian.net/browse/ENGORC-2651
Signed-off-by: Arko Dasgupta [email protected]
(cherry picked from commit 9ccb20b)
Signed-off-by: Arko Dasgupta [email protected]