From 2c270fa5ab2556e9eec3f2079cb6f2075d6dbfa9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Steenis Date: Mon, 27 Jul 2020 14:06:50 +0200 Subject: [PATCH] Use node label when cloudprovider is configured When cloud provider is configured, the node name can be set by the cloud provider. If we don't account for this, the node cannot be found when we do cluster operation (for example, node delete) --- k8s/node.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/node.go b/k8s/node.go index 2bc33b6f..53eb3184 100644 --- a/k8s/node.go +++ b/k8s/node.go @@ -24,8 +24,8 @@ const ( ) func DeleteNode(k8sClient *kubernetes.Clientset, nodeName, cloudProvider string) error { - - if cloudProvider == AWSCloudProvider { + // If cloud provider is configured, the node name can be set by the cloud provider, which can be different from the original node name + if cloudProvider != "" { node, err := GetNode(k8sClient, nodeName) if err != nil { return err