Skip to content
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
merged 1 commit into from
Sep 17, 2019

Conversation

arkodg
Copy link

@arkodg arkodg commented Sep 10, 2019

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]

@arkodg 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
@arkodg
Copy link
Author

arkodg commented Sep 17, 2019

PTAL @dperny @thaJeztah

@codecov
Copy link

codecov bot commented Sep 17, 2019

Codecov Report

Merging #2891 into bump_v19.03 will increase coverage by 0.01%.
The diff coverage is 100%.

@@               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

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@dperny dperny merged commit f35d910 into moby:bump_v19.03 Sep 17, 2019
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
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants