Update logic for detecting taint updates to include taint effect

perfectsense · Jul 19, 2024 · 32bac8a · 32bac8a
1 parent 5c4ecaf
commit 32bac8a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/java/gyro/aws/eks/EksNodegroupResource.java b/src/main/java/gyro/aws/eks/EksNodegroupResource.java
@@ -534,14 +534,15 @@ public void update(
             Set<Taint> taintsToRemove = new HashSet<>(currentTaints);
             taintsToRemove.removeAll(taints);
 
-            // Taint key cannot be in both added and removed, this means it's an update, so remove from remove set.
-            Set<String> taintKeysToAddOrUpdate = taintsToAddOrUpdate.stream()
-                    .map(Taint::key)
-                    .collect(Collectors.toSet());
+            // Detect true updates.
+            // taint key and effect is the same, but the value is different.
             Set<Taint> taintsToUpdate = new HashSet<>();
-            for (Taint taint : taintsToRemove) {
-                if (taintKeysToAddOrUpdate.contains(taint.key())) {
-                    taintsToUpdate.add(taint);
+            for (Taint taintToBeRemoved : taintsToRemove) {
+                for (Taint taintToBeAdded : taintsToAddOrUpdate) {
+                    if (taintToBeRemoved.key().equals(taintToBeAdded.key()) &&
+                            taintToBeRemoved.effect().equals(taintToBeAdded.effect())) {
+                        taintsToUpdate.add(taintToBeRemoved);
+                    }
                 }
             }
             taintsToRemove.removeAll(taintsToUpdate);