Skip to content

Commit

Permalink
Fix delete pod namespace; include error message when failed deleting …
Browse files Browse the repository at this point in the history
…pods
  • Loading branch information
Deyuan Deng committed Feb 26, 2015
1 parent f12f50e commit d47fd48
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/cloudprovider/controller/nodecontroller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down

0 comments on commit d47fd48

Please sign in to comment.