github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #34786 from davidopp/master

Browse Source 
Automatic merge from submit-queue

Make NodeController recognize deletion tombstones

cc/ @lavalamp @gmarek
This commit is contained in:
Kubernetes Submit Queue 2016-10-14 01:47:59 -07:00 committed by GitHub
commit 0b74e39864
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -118,7 +118,16 @@ func forcefullyDeleteNode(kubeClient clientset.Interface, nodeName string, force
func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) { func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
pod, ok := obj.(*api.Pod) pod, ok := obj.(*api.Pod)
if !ok { if !ok {
return tombstone, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
glog.Errorf("Couldn't get object from tombstone %#v", obj)
return
}
pod, ok = tombstone.Obj.(*api.Pod)
if !ok {
glog.Errorf("Tombstone contained object that is not a Pod %#v", obj)
return
}
} }
// consider only terminating pods // consider only terminating pods