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: remove ip mask in Networks.IPAddress #1116

Merged
merged 1 commit into from
Apr 12, 2018

Conversation

rudyfly
Copy link
Collaborator

@rudyfly rudyfly commented Apr 12, 2018

Ⅰ. Describe what this PR did

Removing ip mask in Networks.IPAddress when inspecting a container.
Wrong format: "IPAddress": "172.17.0.2/24", change to ""IPAddress":
"172.17.0.2"

Ⅱ. Does this pull request fix one issue?

fixes #1079

Ⅲ. Describe how you did it

Ⅳ. Describe how to verify it

Ⅴ. Special notes for reviews

Signed-off-by: Rudy Zhang rudyflyzhang@gmail.com

Removing ip mask in Networks.IPAddress when inspecting a container.
Wrong format: "IPAddress": "172.17.0.2/24", change to ""IPAddress":
"172.17.0.2"

Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
@pouchrobot pouchrobot added areas/network kind/bug This is bug report for project size/XS labels Apr 12, 2018
@rudyfly rudyfly requested a review from allencloud April 12, 2018 04:10
@codecov-io
Copy link

Codecov Report

Merging #1116 into master will increase coverage by 0.21%.
The diff coverage is 0%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #1116      +/-   ##
==========================================
+ Coverage   16.44%   16.65%   +0.21%     
==========================================
  Files         165      165              
  Lines        8841     8884      +43     
==========================================
+ Hits         1454     1480      +26     
- Misses       7283     7299      +16     
- Partials      104      105       +1
Impacted Files Coverage Δ
daemon/mgr/network.go 3.57% <0%> (ø) ⬆️
client/client.go 21.42% <0%> (-11.91%) ⬇️
pkg/kernel/kernel.go 66.66% <0%> (-6.07%) ⬇️
cli/command.go 0% <0%> (ø) ⬆️
pkg/utils/utils.go 78.15% <0%> (+2.51%) ⬆️
daemon/containerio/raw_file.go 4.16% <0%> (+4.16%) ⬆️

@allencloud
Copy link
Collaborator

I tested on my machine, and it works fine:

        "Networks": {
            "bridge": {
                "Aliases": null,
                "EndpointID": "290d3ae3f92a9e625a6be05b92f4c364efc59bafe3c68fbd537be0d0800b7f04",
                "Gateway": "172.17.0.1",
                "IPAddress": "172.17.0.2",
                "IPPrefixLen": 24,
                "Links": null,
                "MacAddress": "02:42:ac:11:00:02",
                "NetworkID": "9193e29240031375a2eae3cb40aef668a0812ba6f50a4db0b983bcadbcbe7434"
            }
        },

LGTM

@pouchrobot pouchrobot added the LGTM one maintainer or community participant agrees to merge the pull reuqest. label Apr 12, 2018
@allencloud
Copy link
Collaborator

also cc @112101160 for a quick look.

@allencloud allencloud merged commit e143482 into AliyunContainerService:master Apr 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
areas/network kind/bug This is bug report for project LGTM one maintainer or community participant agrees to merge the pull reuqest. size/XS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[bug] pouch container network IPAdress has a suffix
4 participants