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

Kubelet read pods from file #5704

Merged
merged 2 commits into from
Mar 20, 2015
Merged

Conversation

wojtek-t
Copy link
Member

This PR is the continuation of #5598
There are two separate commits, since the first one is just a refactoring to allow code sharing.

cc @vmarmol @yujuhong

@wojtek-t
Copy link
Member Author

I've just run e2e tests - all tests are passing:
Ran 28 of 30 Specs in 1582.130 seconds
SUCCESS! -- 28 Passed | 0 Failed | 2 Pending | 0 Skipped I0320 12:51:24.240236 21632 driver.go:89] All tests pass

@vmarmol
Copy link
Contributor

vmarmol commented Mar 20, 2015

LGTM minus the move to default. I'm okay merging as-is if you've gone home for the day.

@wojtek-t
Copy link
Member Author

If possible, I would prefer to do it in a separate PR. But decision is up to you.

@vmarmol
Copy link
Contributor

vmarmol commented Mar 20, 2015

SGTM, merging. Thanks @wojtek-t!

vmarmol added a commit that referenced this pull request Mar 20, 2015
@vmarmol vmarmol merged commit c5f7351 into kubernetes:master Mar 20, 2015
@wojtek-t
Copy link
Member Author

Thanks!

@erictune
Copy link
Member

Document this somewhere.

On Fri, Mar 20, 2015 at 10:18 AM, Wojciech Tyczynski <
notifications@github.com> wrote:

Thanks!


Reply to this email directly or view it on GitHub
#5704 (comment)
.

@yujuhong
Copy link
Contributor

I believe both integration and e2e tests use manifest files only (since kubelet could not read pods before). Could you add some more tests for reading pods? Eventually all tests should use pods, but I am not sure when we're going to deprecate container manifests.

@bgrant0607
Copy link
Member

We are in the process of wrapping up and enabling v1beta3 now. @nikhiljindal is working on running tests using v1beta3 as well as v1beta1. We should do the same for the file-based pods -- run both formats for now.

@wojtek-t
Copy link
Member Author

I did some checking and it seems that none of the e2e tests is using Kubelet mechanism to read pods from http/file. IIUC, currently the only existing test for it (except from unit tests) are integration tests. I'm going to change them to test both Pod & ContainerManifest format.

@erictune
Copy link
Member

That sounds good. Suggest you write a standalone integration test in the
style of test/integration/client_test.go instead adding to the one big
monolithic integration test, cmd/integration/integration.go. That one does
not scale in terms of debug.

On Mon, Mar 23, 2015 at 4:38 AM, Wojciech Tyczynski <
notifications@github.com> wrote:

I did some checking and it seems that none of the e2e tests is using
Kubelet mechanism to read pods from http/file. IIUC, currently the only
existing test for it (except from unit tests) are integration tests. I'm
going to change them to test both Pod & ContainerManifest format.


Reply to this email directly or view it on GitHub
#5704 (comment)
.

@wojtek-t wojtek-t deleted the kubelet_file_read_pod branch March 27, 2015 10:23
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.

6 participants