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.

Sign up for GitHub

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

Jump to bottom

Remove redundant pod deletion in scheduler predicates tests and fix taints-tolerations e2e #29423

Merged
merged 1 commit into from
Jul 29, 2016
Merged

Remove redundant pod deletion in scheduler predicates tests and fix taints-tolerations e2e #29423

merged 1 commit into from
Jul 29, 2016

Conversation

kevin-wangzefeng
Copy link
Member

@kevin-wangzefeng kevin-wangzefeng commented Jul 22, 2016 •
edited
Loading

In scheduler predicates test, some tests won't clean pods they created when exit with failure, which may lead to pod leak. This PR is to fix it.

Remove redundant pod deletion in scheduler predicates tests, since framework.AfterEach() already did the cleanup work after every test.

Also fix the test "validates that taints-tolerations is respected if not matching", refer to the change on taint-toleration test in #29003, and #24134 (comment).

@kevin-wangzefeng
Copy link
Member Author

@davidopp @gmarek PTAL

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels Jul 22, 2016
@davidopp
Copy link
Member

LGTM

This is fine but I thought we delete the test namespace after every test regardless of whether it succeeds or fails, so all the pods should get cleaned up automatically?

@davidopp davidopp assigned davidopp and unassigned fejta Jul 22, 2016
@davidopp davidopp added release-note-none Denotes a PR that doesn't merit a release note. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Jul 22, 2016
@wojtek-t
Copy link
Member

This is fine but I thought we delete the test namespace after every test regardless of whether it succeeds or fails, so all the pods should get cleaned up automatically?

Yes - I agree with that. In my opinion this PR is no-op.

In fact I actually think that we should do soemthing different, which is "get rid of all those "Delete pod" calls at all. If those tests are written correctly, those will be removed while deleting the namespace at the end of the test, otherwise, we should fix that.

@davidopp davidopp removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 22, 2016
@davidopp
Copy link
Member

OK, removing LGTM. Kevin, what do you think?

(Note that the PR does one other unrelated thing, the change at the end of the PR, which is unrelated to "cleaning up" pods.)

@kevin-wangzefeng
Copy link
Member Author

@davidopp @wojtek-t thanks for the suggestion, I refreshed the PR to remove the redundant pod deletion, since framework.AfterEach() already did the cleanup work after every test.

@kevin-wangzefeng kevin-wangzefeng changed the title update scheduler predicates tests, make sure pods cleaned when test failed Remove redundant pod deletion in scheduler predicates tests and fix taints-tolerations e2e Jul 26, 2016
@davidopp
Copy link
Member

LGTM

Thanks!

@davidopp davidopp added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 26, 2016
@gmarek
Copy link
Contributor

gmarek commented Jul 26, 2016

LGMT - thanks a lot!

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 26, 2016
@kevin-wangzefeng kevin-wangzefeng force-pushed the fix-taints-tolerations-e2e branch from 9dde331 to 57d22a1 Compare July 27, 2016 06:32
@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Jul 27, 2016
@k8s-bot
Copy link

k8s-bot commented Jul 27, 2016

GCE e2e build/test passed for commit 57d22a1.

@kevin-wangzefeng
Copy link
Member Author

@davidopp squashed and rebased, PTAL

@davidopp davidopp added lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-merge labels Jul 28, 2016
@davidopp
Copy link
Member

LGTM

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jul 28, 2016
@kevin-wangzefeng
Copy link
Member Author

@davidopp seems the PR is blocked by the bot, can you help to take a look?

@wojtek-t wojtek-t removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Jul 29, 2016
@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@k8s-bot
Copy link

k8s-bot commented Jul 29, 2016

GCE e2e build/test passed for commit 57d22a1.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit eca270b into kubernetes:master Jul 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@davidopp davidopp

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@kevin-wangzefeng @davidopp @wojtek-t @gmarek @k8s-bot @k8s-github-robot @fejta @googlebot