From 82a69b281585b7319dd181ee31d46985bc05b79d Mon Sep 17 00:00:00 2001 From: Josh Horwitz Date: Fri, 25 Aug 2017 16:25:19 -0400 Subject: [PATCH] refactor method name as per comments --- pkg/controller/cloud/node_controller.go | 6 +++--- pkg/controller/cloud/node_controller_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/controller/cloud/node_controller.go b/pkg/controller/cloud/node_controller.go index c5557832d0f..94308cdcbbd 100644 --- a/pkg/controller/cloud/node_controller.go +++ b/pkg/controller/cloud/node_controller.go @@ -237,7 +237,7 @@ func (cnc *CloudNodeController) MonitorNode() { if currentReadyCondition.Status != v1.ConditionTrue { // Check with the cloud provider to see if the node still exists. If it // doesn't, delete the node immediately. - exists, err := ensureNodeExistsByProviderIDOrName(instances, node) + exists, err := ensureNodeExistsByProviderIDOrExternalID(instances, node) if err != nil { glog.Errorf("Error getting data for node %s from cloud: %v", node.Name, err) continue @@ -382,8 +382,8 @@ func excludeTaintFromList(taints []v1.Taint, toExclude v1.Taint) []v1.Taint { return newTaints } -// ensureNodeExistsByProviderIDOrName first checks if the instance exists by the provider id and then by node name -func ensureNodeExistsByProviderIDOrName(instances cloudprovider.Instances, node *v1.Node) (bool, error) { +// ensureNodeExistsByProviderIDOrExternalID first checks if the instance exists by the provider id and then by calling external id with node name +func ensureNodeExistsByProviderIDOrExternalID(instances cloudprovider.Instances, node *v1.Node) (bool, error) { exists, err := instances.InstanceExistsByProviderID(node.Spec.ProviderID) if err != nil { providerIDErr := err diff --git a/pkg/controller/cloud/node_controller_test.go b/pkg/controller/cloud/node_controller_test.go index 9cdebd140d1..32116831a85 100644 --- a/pkg/controller/cloud/node_controller_test.go +++ b/pkg/controller/cloud/node_controller_test.go @@ -128,7 +128,7 @@ func TestEnsureNodeExistsByProviderIDOrNodeName(t *testing.T) { } instances, _ := fc.Instances() - exists, err := ensureNodeExistsByProviderIDOrName(instances, tc.node) + exists, err := ensureNodeExistsByProviderIDOrExternalID(instances, tc.node) if err != nil { t.Error(err) }