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

UPSTREAM: 41436: Fix bug in status manager TerminatePod #13377

Merged
merged 1 commit into from
Mar 15, 2017

Conversation

derekwaynecarr
Copy link
Member

See: kubernetes/kubernetes#41436

In TerminatePod, we previously pass pod.Status to updateStatusInternal. This is a bug, since it is the original status that we are given. Not only does it skip updates made to container statuses, but in some cases it reverted the pod's status to an earlier version, since it was being passed a stale status initially.

@derekwaynecarr
Copy link
Member Author

#12994 did not merge prior to the 1.5 cut, and we should have this fix before we ship.

@derekwaynecarr
Copy link
Member Author

/cc @eparis @smarterclayton

@eparis
Copy link
Member

eparis commented Mar 13, 2017

[merge]

@eparis
Copy link
Member

eparis commented Mar 13, 2017

[test]

@derekwaynecarr
Copy link
Member Author

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 0dafa2f

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/170/) (Base Commit: e4200f3)

@eparis
Copy link
Member

eparis commented Mar 14, 2017

[merge] some flake about networking

@smarterclayton
Copy link
Contributor

smarterclayton commented Mar 14, 2017 via email

@derekwaynecarr
Copy link
Member Author

another flake re haproxy re [merge]

@derekwaynecarr
Copy link
Member Author

re [merge]

hit #13271

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 0dafa2f

@openshift-bot
Copy link
Contributor

openshift-bot commented Mar 14, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/86/) (Base Commit: 1404858) (Image: devenv-rhel7_6068)

@openshift-bot openshift-bot merged commit 4bdf7ce into openshift:release-1.5 Mar 15, 2017
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.

4 participants