github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4832 from ddysher/add-err-msg

Browse Source 
Fix delete pod namespace; include error message when failed deleting pods
This commit is contained in:
Vish Kannan 2015-02-25 18:47:14 -08:00
commit 7547f70aab
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cloudprovider/controller/nodecontroller.go
View File

@ -339,8 +339,8 @@ func (s *NodeController) deletePods(nodeID string) error {
continue continue
} }
glog.V(2).Infof("Delete pod %v", pod.Name) glog.V(2).Infof("Delete pod %v", pod.Name)
if err := s.kubeClient.Pods(api.NamespaceAll).Delete(pod.Name); err != nil { if err := s.kubeClient.Pods(pod.Namespace).Delete(pod.Name); err != nil {
glog.Errorf("Error deleting pod %v", pod.Name) glog.Errorf("Error deleting pod %v: %v", pod.Name, err)
} }
} }