github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22472 from caesarxuchao/log-nodecontroller

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-03 20:19:06 -08:00
commit 601104f201
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,7 +370,7 @@ func forcefullyDeletePod(c clientset.Interface, pod *api.Pod) error {
var zero int64 var zero int64
err := 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 { if err == nil {
glog.V(2).Infof("forceful deletion of %s succeeded", pod.Name) glog.Infof("forceful deletion of %s succeeded", pod.Name)
} }
return err return err
} }