Minor tweak

swarmlibs · Jul 10, 2024 · fe968b8 · fe968b8
1 parent 37d2f9d
commit fe968b8
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/main.go b/main.go
@@ -157,10 +157,11 @@ func processTaskLabels(logger log.Logger, cli *client.Client, ctx context.Contex
 
 			for key := range node.Spec.Labels {
 				if _, ok := labels[key]; !ok {
-					if strings.HasPrefix(key, serviceLabelPrefix) {
+					if strings.HasPrefix(key, stackNamespaceLabelPrefix) {
 						delete(node.Spec.Labels, key)
 						level.Info(logger).Log("msg", "Removing label from node", "node", node.ID, "label", key)
-					} else if strings.HasPrefix(key, stackNamespaceLabelPrefix) {
+					}
+					if strings.HasPrefix(key, serviceLabelPrefix) {
 						delete(node.Spec.Labels, key)
 						level.Info(logger).Log("msg", "Removing label from node", "node", node.ID, "label", key)
 					}
@@ -173,10 +174,11 @@ func processTaskLabels(logger log.Logger, cli *client.Client, ctx context.Contex
 			}
 		} else {
 			for key := range node.Spec.Labels {
-				if strings.HasPrefix(key, serviceLabelPrefix) {
+				if strings.HasPrefix(key, stackNamespaceLabelPrefix) {
 					delete(node.Spec.Labels, key)
 					level.Info(logger).Log("msg", "Removing label from node", "node", node.ID, "label", key)
-				} else if strings.HasPrefix(key, stackNamespaceLabelPrefix) {
+				}
+				if strings.HasPrefix(key, serviceLabelPrefix) {
 					delete(node.Spec.Labels, key)
 					level.Info(logger).Log("msg", "Removing label from node", "node", node.ID, "label", key)
 				}