From d47fd48e554b02cd67c7b6b61fcb3391a1d26bf5 Mon Sep 17 00:00:00 2001 From: Deyuan Deng Date: Wed, 25 Feb 2015 19:14:54 -0500 Subject: [PATCH] Fix delete pod namespace; include error message when failed deleting pods --- pkg/cloudprovider/controller/nodecontroller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/controller/nodecontroller.go b/pkg/cloudprovider/controller/nodecontroller.go index f66a566f562..180016ee44f 100644 --- 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) } }