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

Correctly filter terminated pods in kubectl #48786

Merged
merged 1 commit into from
Jul 12, 2017
Merged

Correctly filter terminated pods in kubectl #48786

merged 1 commit into from
Jul 12, 2017

Conversation

janetkuo
Copy link
Member

@janetkuo janetkuo commented Jul 12, 2017 •
edited by enisoc
Loading

We shouldn't use Status.Reason to determine whether the pod has terminated or not.

kubectl: Fix bug that showed terminated/evicted pods even without `--show-all`.

@janetkuo janetkuo added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 12, 2017
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 12, 2017
@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 12, 2017
@yujuhong
Copy link
Contributor

/lgtm

How about cherry-picking to 1.7/1.6 since this is a regression?

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 12, 2017
@janetkuo
Copy link
Member Author

/approve no-issue

@janetkuo
Copy link
Member Author

+1 to cherrypick

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: janetkuo, yujuhong

Associated issue requirement bypassed by: janetkuo

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

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 12, 2017
@janetkuo
Copy link
Member Author

/retest

@yujuhong yujuhong added this to the v1.7 milestone Jul 12, 2017
@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 48672, 47140, 48709, 48786, 48757)

k8s-github-robot pushed a commit that referenced this pull request Jul 12, 2017
Merge pull request #48786 from janetkuo/show-all-fix
b996d8a 
Automatic merge from submit-queue (batch tested with PRs 48672, 47140, 48709, 48786, 48757)

Correctly filter terminated pods in kubectl

We shouldn't use `Status.Reason` to determine whether the pod has terminated or not.
@k8s-github-robot k8s-github-robot merged commit b996d8a into kubernetes:master Jul 12, 2017
This was referenced Jul 12, 2017
Merged
Merged
@enisoc enisoc mentioned this pull request Jul 12, 2017
Merged
@enisoc
Copy link
Member

enisoc commented Jul 12, 2017 •
edited
Loading

It looks like the bug was introduced in 1.5.0. Should we cherrypick that far back? Also, is anyone already planning to do the cherrypicks? If not, I will do it.

@enisoc
Copy link
Member

enisoc commented Jul 12, 2017

Oops looks like my page was out of date. :) @janetkuo What do you think about 1.5 though?

@enisoc enisoc modified the milestones: v1.6, v1.7 Jul 12, 2017
@enisoc enisoc added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Jul 12, 2017
k8s-github-robot pushed a commit that referenced this pull request Jul 12, 2017
Merge pull request #48831 from enisoc/resource-filter-test
b31d1db 
Automatic merge from submit-queue (batch tested with PRs 46738, 48827, 48831)

Add test for kubectl resource filter.

This should prevent regression of the bug fixed in #48786.
@mengqiy mengqiy mentioned this pull request Jul 13, 2017
Closed
k8s-github-robot pushed a commit that referenced this pull request Jul 18, 2017
Merge pull request #48821 from janetkuo/automated-cherry-pick-of-#487…
e896537 
…86-upstream-release-1.7

Automatic merge from submit-queue

Automated cherry pick of #48786 upstream release 1.7

Cherrypick #48786 to fix a regression in 1.7
k8s-github-robot pushed a commit that referenced this pull request Jul 20, 2017
Merge pull request #48823 from janetkuo/automated-cherry-pick-of-#487…
849c798 
…86-upstream-release-1.6

Automatic merge from submit-queue

Automated cherry pick of #48786 upstream release 1.6

Cherrypick #48786 to fix a regression in 1.6

/approve no-issue
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.6" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@mengqiy mengqiy

@yujuhong yujuhong

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 Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.6
Development

Successfully merging this pull request may close these issues.
7 participants
@janetkuo @yujuhong @k8s-github-robot @enisoc @k8s-cherrypick-bot @mengqiy @k8s-ci-robot