scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22376 from caesarxuchao/add-log-nodecontroller

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-03-02 13:36:34 -08:00
parent 2cf91576a1 f8dd7fe1de
commit ec77d0841d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/node/nodecontroller.go
View File

@@ -368,7 +368,11 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
func forcefullyDeletePod(c clientset.Interface, pod *api.Pod) error { func forcefullyDeletePod(c clientset.Interface, pod *api.Pod) error {
var zero int64 var zero int64
return c.Core().Pods(pod.Namespace).Delete(pod.Name, &api.DeleteOptions{GracePeriodSeconds: &zero}) err := c.Core().Pods(pod.Namespace).Delete(pod.Name, &api.DeleteOptions{GracePeriodSeconds: &zero})
if err == nil {
glog.V(2).Infof("forceful deletion of %s succeeded", pod.Name)
}
return err
} }
// monitorNodeStatus verifies node status are constantly updated by kubelet, and if not, // monitorNodeStatus verifies node status are constantly updated by kubelet, and if not,