Fix delete pod namespace; include error message when failed deleting pods

This commit is contained in:
Deyuan Deng 2015-02-25 19:14:54 -05:00
parent f12f50e996
commit d47fd48e55

View File

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