github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving deletion behavior from the NC into PodGC

Browse Source 
This should be a NOP because we're just moving functionality
around and thanks to #35476, the podGC controller should always
run anyway.
This commit is contained in:
Anirudh
2016-10-25 11:18:58 -07:00
parent b47d862aea
commit 05365d7cb2
3 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/controller/node/controller_utils.go
View File

@@ -135,12 +135,6 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
return
}
// delete terminating pods that have not yet been scheduled
if len(pod.Spec.NodeName) == 0 {
utilruntime.HandleError(nc.forcefullyDeletePod(pod))
return
}
nodeObj, found, err := nc.nodeStore.Store.GetByKey(pod.Spec.NodeName)
if err != nil {
// this can only happen if the Store.KeyFunc has a problem creating
@@ -150,11 +144,8 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
return
}
// delete terminating pods that have been scheduled on
// nonexistent nodes
// if there is no such node, do nothing and let the podGC clean it up.
if !found {
glog.Warningf("Unable to find Node: %v, deleting all assigned Pods.", pod.Spec.NodeName)
utilruntime.HandleError(nc.forcefullyDeletePod(pod))
return
}