Skip to content
This repository has been archived by the owner. It is now read-only.

list: add ip of non-running pods to status output #3857

Merged
merged 4 commits into from Jan 10, 2018
Merged

Conversation

@captain-me0w
Copy link
Contributor

@captain-me0w captain-me0w commented Nov 19, 2017

partial fix for #3550
ip of the non running pod is added to the json output

@squeed
Copy link
Contributor

@squeed squeed commented Nov 20, 2017

What happens if you change https://github.com/rkt/rkt/blob/master/pkg/pod/pods.go?utf8=%E2%9C%93#L272 from if p.isRunning() to if p.isRunning() || p.isExited()? Would that accomplish the same thing?

@captain-me0w captain-me0w force-pushed the captain-me0w:ipshow branch from f0e735f to 54683fc Nov 20, 2017
@captain-me0w
Copy link
Contributor Author

@captain-me0w captain-me0w commented Nov 20, 2017

@squeed thanks for reviewing the PR. I have made changes as you suggested.

@squeed
Copy link
Contributor

@squeed squeed commented Nov 21, 2017

Works for me. Can you add a test to rkt_list_test.go? Then this can be merged.

@captain-me0w captain-me0w force-pushed the captain-me0w:ipshow branch 2 times, most recently from 01529d2 to f8e886a Nov 22, 2017
{
"list --format=json",
true,
podUuid

This comment has been minimized.

@iaguis

iaguis Dec 18, 2017
Member

Can you add a comma here so tests pass?

@captain-me0w captain-me0w force-pushed the captain-me0w:ipshow branch 2 times, most recently from 12ea62a to 0a2ede8 Dec 18, 2017
@captain-me0w
Copy link
Contributor Author

@captain-me0w captain-me0w commented Dec 27, 2017

@squeed I have added the test case. @iaguis I have made the changes. the test is passing in my local environment but it's failing in the semaphore

@iaguis
Copy link
Member

@iaguis iaguis commented Jan 2, 2018

It seems your change breaks TestAPIServiceCgroup. The reason is that we now consider network information for exited pods but the API service doesn't, so the test fails because the info returned by the API service doesn't match the one returned by rkt status.

We should modify the API service to populate network information on exited pods, like we do for running ones.

@captain-me0w
Copy link
Contributor Author

@captain-me0w captain-me0w commented Jan 3, 2018

@iaguis Thanks for helping me out. Now the test is passing. please review the PR.

@iaguis
iaguis approved these changes Jan 3, 2018
Copy link
Member

@iaguis iaguis left a comment

lgtm

But can you make your commit follow our convention?

We also try to prefer imperative in titles: like "add ip of non running"...

Thanks!

@squeed
squeed approved these changes Jan 3, 2018
@lucab lucab changed the title list: ip of non running pod is added to the json output list: add ip of non-running pods to status output Jan 8, 2018
@captain-me0w captain-me0w force-pushed the captain-me0w:ipshow branch from 89424fb to 13761c3 Jan 10, 2018
@captain-me0w
Copy link
Contributor Author

@captain-me0w captain-me0w commented Jan 10, 2018

@iaguis I have made changes, please check

@iaguis
iaguis approved these changes Jan 10, 2018
Copy link
Member

@iaguis iaguis left a comment

Thanks!

@iaguis iaguis merged commit 6d32c3f into rkt:master Jan 10, 2018
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
semaphoreci The build passed on Semaphore.
Details
@iaguis iaguis added this to the 1.30.0 milestone Apr 11, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants