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

d47fd48e · Deyuan Deng · f12f50e9 · d47fd48e
Commit d47fd48e authored Feb 25, 2015 by Deyuan Deng
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

nodecontroller.go pkg/cloudprovider/controller/nodecontroller.go +2 -2

No files found.
--- a/pkg/cloudprovider/controller/nodecontroller.go
+++ b/pkg/cloudprovider/controller/nodecontroller.go
@@ -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)
 		}
 	}