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

bugfix: fix the wrong bridge gateway #1495

Merged
merged 1 commit into from
Jun 8, 2018

Conversation

rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Jun 8, 2018

Ⅰ. Describe what this PR did

Before default nat network is 172.17.0.1/24, commit: 7e7f607 has
changed it to 192.168.5.1/24. If "p0" is exist, pouchd start will check
gateway is error.

Ⅱ. Does this pull request fix one issue?

fixes #1494

Ⅲ. Describe how you did it

When get the bridge route is nil and haven't configed gateway in config.json, so we use bridge ip address as gateway.

Ⅳ. Describe how to verify it

set p0 bridge as before 172.17.0.1/24, and start pouchd

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang [email protected]

Before default nat network is 172.17.0.1/24, commit: 7e7f607 has
changed it to 192.168.5.1/24. If "p0" is exist, pouchd start will check
gateway is error.

Signed-off-by: Rudy Zhang <[email protected]>
@pouchrobot pouchrobot added kind/bug This is bug report for project size/M labels Jun 8, 2018
@rudyfly rudyfly requested review from Letty5411 and shaloulcy June 8, 2018 07:37
@codecov-io
Copy link

Codecov Report

Merging #1495 into master will decrease coverage by 0.08%.
The diff coverage is 68.18%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1495      +/-   ##
==========================================
- Coverage   40.45%   40.37%   -0.09%     
==========================================
  Files         253      251       -2     
  Lines       16466    16475       +9     
==========================================
- Hits         6662     6651      -11     
- Misses       8948     8969      +21     
+ Partials      856      855       -1
Impacted Files Coverage Δ
network/mode/bridge/bridge.go 60.36% <68.18%> (+3.49%) ⬆️
client/network_connect.go 0% <0%> (-100%) ⬇️
client/container_exec.go 0% <0%> (-80%) ⬇️
client/container_attach.go
client/container_upgrade.go
client/container_logs.go
client/container.go 0% <0%> (ø)
ctrd/container.go 50.18% <0%> (+0.72%) ⬆️
daemon/logger/jsonfile/utils.go 71.66% <0%> (+1.66%) ⬆️
ctrd/image.go 79.42% <0%> (+2.85%) ⬆️

@Letty5411
Copy link
Contributor

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Jun 8, 2018
@rudyfly rudyfly merged commit 3988b7b into AliyunContainerService:master Jun 8, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/M
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] pouchd start failed with error failed to allocate gateway
4 participants