-
Notifications
You must be signed in to change notification settings - Fork 39k
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
make nodecontroller delete terminating pods on 1.0 nodes #15930
Conversation
Labelling this PR as size/L |
Other than having one more cache of pods, seems accurate. |
This works but exposed an issue with mirror pods. Filed #15960 |
@@ -238,6 +289,48 @@ func (nc *NodeController) getCondition(status *api.NodeStatus, conditionType api | |||
return nil | |||
} | |||
|
|||
func (nc *NodeController) checkPod(obj interface{}) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this function needs a name that (1) implies it sometimes deletes pods, (2) if possible tries to describe the conditions under which it deletes pods. If (2) is not possible to express concisely you could just call the function maybeDeletePod()
also, please add a function-level comment explaining the reason for each of the deletion circumstances, or put inline comments for each of the blocks where you call nc.forcefullyDeletePod() explaining the reason
GCE e2e test build/test passed for commit 63060919f055a9e44fe4204943be60814c5631ab. |
GCE e2e test build/test passed for commit fd17cd347243f3f2e36fc1b6c174c6a2e1d504d0. |
// versions less than 1.1.0 | ||
node := nodeObj.(*api.Node) | ||
if strings.HasPrefix(node.Status.NodeInfo.KubeletVersion, "v1.0") { | ||
// delete terminating pods that have been scheudled on |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo: scheduled
GCE e2e build/test failed for commit 836b683. |
@k8s-bot ok to test |
GCE e2e test build/test passed for commit 5c5ee8b23fda9ab9a1604abe4b49900b2cdbebc3. |
GCE e2e test build/test passed for commit 836b683. |
LGTM |
make nodecontroller delete terminating pods on 1.0 nodes
@mikedanese Can you please file an issue under |
We want this forever as well, except for the last block |
Ack. Then just an issue for the last block? |
…pick-of-#15153-kubernetes#15900-kubernetes#15930-upstream-release-1.1 Auto commit by PR queue bot
…pick-of-#15153-kubernetes#15900-kubernetes#15930-upstream-release-1.1 Auto commit by PR queue bot
TODO: make sure it actually works and then write tests