From c3cb2bbc6c12dc472ba42f9b386de3a0bf37de29 Mon Sep 17 00:00:00 2001
From: harbottle <harbottle@room3d3.com>
Date: Mon, 16 May 2022 19:43:22 +0100
Subject: [PATCH] Tidy node labelling code

---
 cmd/kured/main.go | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmd/kured/main.go b/cmd/kured/main.go
index 737c831..95bf8cb 100644
--- a/cmd/kured/main.go
+++ b/cmd/kured/main.go
@@ -217,8 +217,7 @@ func flagCheck(cmd *cobra.Command, args []string) {
 			notifyURL = fmt.Sprintf("slack://%s", strings.Trim(trataURL.Path, "/services/"))
 		}
 	}
-	var preRebootNodeLabelKeys []string
-	var afterRebootNodeLabelKeys []string
+	var preRebootNodeLabelKeys, afterRebootNodeLabelKeys []string
 	for _, label := range preRebootNodeLabels {
 		preRebootNodeLabelKeys = append(preRebootNodeLabelKeys, strings.Split(label, "=")[0])
 	}
@@ -450,7 +449,7 @@ func drain(client *kubernetes.Clientset, node *v1.Node) error {
 	nodename := node.GetName()
 
 	if preRebootNodeLabels != nil {
-		addNodeLabels(client, node, preRebootNodeLabels)
+		updateNodeLabels(client, node, preRebootNodeLabels)
 	}
 
 	log.Infof("Draining node %s", nodename)
@@ -499,7 +498,7 @@ func uncordon(client *kubernetes.Clientset, node *v1.Node) error {
 		log.Fatalf("Error uncordonning %s: %v", nodename, err)
 		return err
 	} else if afterRebootNodeLabels != nil {
-		addNodeLabels(client, node, afterRebootNodeLabels)
+		updateNodeLabels(client, node, afterRebootNodeLabels)
 	}
 	return nil
 }
@@ -578,12 +577,12 @@ func deleteNodeAnnotation(client *kubernetes.Clientset, nodeID, key string) erro
 	return nil
 }
 
-func addNodeLabels(client *kubernetes.Clientset, node *v1.Node, labels []string) {
+func updateNodeLabels(client *kubernetes.Clientset, node *v1.Node, labels []string) {
 	for _, label := range labels {
 		k := strings.Split(label, "=")[0]
 		v := strings.Split(label, "=")[1]
 		node.Labels[k] = v
-		log.Infof("Adding node %s label: %s=%s", node.GetName(), k, v)
+		log.Infof("Updating node %s label: %s=%s", node.GetName(), k, v)
 	}
 
 	bytes, err := json.Marshal(node)
@@ -599,7 +598,7 @@ func addNodeLabels(client *kubernetes.Clientset, node *v1.Node, labels []string)
 			v := strings.Split(label, "=")[1]
 			labelsErr += fmt.Sprintf("%s=%s ", k, v)
 		}
-		log.Fatalf("Error adding node labels %s via k8s API: %v", labelsErr, err)
+		log.Fatalf("Error updating node labels %s via k8s API: %v", labelsErr, err)
 	}
 }