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

Fix running e2e tests with completed kube-system pods #64098

Merged
merged 2 commits into from
May 23, 2018
Merged

Fix running e2e tests with completed kube-system pods #64098

merged 2 commits into from
May 23, 2018

Conversation

jacobwgillespie
Copy link
Contributor

@jacobwgillespie jacobwgillespie commented May 21, 2018 •
edited
Loading

As per @timothysc's suggestion, this PR is the same as PR #53222, but with the CLA signed and with a comment explaining why completed pods are skipped. Credit for finding this fix goes to @dlosev.

From the original PR:

Currently e2e runner fails during BeforeSuite execution if there are pods in kube-system namespace in 'Completed' state.

Exactly this issue was fixed previously in #37325 by adding new option "skipSucceeded" to ignore 'Completed' pods. Then, in 2e3cd93#diff-eb7b79470992813ea1905e96c298b47bL557 that option was removed and code was adjusted to ignore 'Completed' pods all the time. But in 0bf96a3 that code was accidentally removed as redundant.

This fix restores removed code.

NONE

@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 21, 2018
@jacobwgillespie jacobwgillespie mentioned this pull request May 21, 2018
Closed
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels May 21, 2018
@BenTheElder
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 21, 2018
@BenTheElder
Copy link
Member

/retest

timothysc
timothysc suggested changes May 22, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve

lgtm after minor changes.

test/e2e/framework/util.go Outdated
badPods = append(badPods, pod)
// it doesn't make sense to wait for this pod
return false, errors.New("unexpected Succeeded pod state")
// pod status is succeeded, it doesn't make sense to wait for this pod
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a logf statement here otherwise, lgtm

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logf message added 👍

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 22, 2018
timothysc
timothysc approved these changes May 22, 2018
View reviewed changes
Copy link
Member

@timothysc timothysc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 22, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jacobwgillespie, timothysc

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 63283, 64032, 64159, 64126, 64098). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 9c2e51f into kubernetes:master May 23, 2018
@jacobwgillespie jacobwgillespie deleted the fix-e2e-complete-pods-in-kube-system-ns-failure branch May 23, 2018 21:41
@jacobwgillespie jacobwgillespie mentioned this pull request May 24, 2018
Merged
k8s-github-robot pushed a commit that referenced this pull request Sep 3, 2018
Merge pull request #64243 from jacobwgillespie/automated-cherry-pick-…
ba92f7a 
…of-#64098-upstream-release-1.10

Automatic merge from submit-queue.

Automated cherry pick of #64098: Fix running e2e tests with completed kube-system pods

Cherry pick of #64098 on release-1.10.

#64098: Fix running e2e tests with completed kube-system pods

```release-note
NONE
```
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timothysc timothysc timothysc approved these changes

@rramkumar1 rramkumar1 Awaiting requested review from rramkumar1

@smarterclayton smarterclayton Awaiting requested review from smarterclayton

Assignees

@timothysc timothysc

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@jacobwgillespie @BenTheElder @k8s-ci-robot @k8s-github-robot @timothysc