Skip to content

K
k3s
Commit 7547f70a authored by Vish Kannan's avatar Vish Kannan
Browse files
Options

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

Fix delete pod namespace; include error message when failed deleting pods
parents 6601ff78 d47fd48e
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/cloudprovider/controller/nodecontroller.go
View file @ 7547f70a
...@@ -339,8 +339,8 @@ func (s *NodeController) deletePods(nodeID string) error { ...@@ -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)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment