From 34eec1fc78484c7bca21a675dadde730d08139bd Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 11 Aug 2015 12:33:35 -0700 Subject: [PATCH] Switch the order of delete, delete pods before deleting nodes. --- pkg/controller/node/nodecontroller.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/controller/node/nodecontroller.go b/pkg/controller/node/nodecontroller.go index a90ddf87987..9a44c0d13be 100644 --- a/pkg/controller/node/nodecontroller.go +++ b/pkg/controller/node/nodecontroller.go @@ -303,13 +303,14 @@ func (nc *NodeController) monitorNodeStatus() error { if _, err := instances.ExternalID(node.Name); err != nil && err == cloudprovider.InstanceNotFound { glog.Infof("Deleting node (no longer present in cloud provider): %s", node.Name) nc.recordNodeEvent(node.Name, fmt.Sprintf("Deleting Node %v because it's not present according to cloud provider", node.Name)) + if err := nc.deletePods(node.Name); err != nil { + glog.Errorf("Unable to delete pods from node %s: %v", node.Name, err) + continue + } if err := nc.kubeClient.Nodes().Delete(node.Name); err != nil { glog.Errorf("Unable to delete node %s: %v", node.Name, err) continue } - if err := nc.deletePods(node.Name); err != nil { - glog.Errorf("Unable to delete pods from node %s: %v", node.Name, err) - } } } }