Merge pull request #11 from annismckenzie/fix-issue-10

Check taints to be removed against the existing taints

README.md

@@ -33,7 +33,7 @@ That Kubernetes operator doesn't exist. At least, it didn't until now. 🤠
 ## Installation
 
 ```sh
-  kubectl apply -f https://raw.githubusercontent.com/annismckenzie/k3os-config-operator/v0.1.0/deploy/operator.yaml
+  kubectl apply -f https://raw.githubusercontent.com/annismckenzie/k3os-config-operator/v0.1.1/deploy/operator.yaml
 ```
 
 

config/production/kustomization.yaml

@@ -6,4 +6,4 @@ resources:
 
 images:
   - name: ghcr.io/annismckenzie/k3os-config-operator
-    newTag: v0.1.0
+    newTag: v0.1.1

deploy/operator.yaml

@@ -320,7 +320,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: ghcr.io/annismckenzie/k3os-config-operator:v0.1.0
+        image: ghcr.io/annismckenzie/k3os-config-operator:v0.1.1
         name: manager
         resources:
           limits:

pkg/nodes/tainter.go

@@ -76,6 +76,18 @@ func (t *tainter) Reconcile(node *corev1.Node, configNodeTaints []string) error
 		return errors.ErrSkipUpdate
 	}
 
+	// here we check whether any of the taints that should be removed
+	// can even be removed from the node's taints or whether they were
+	// potentially already removed in a previous reconciliation
+	tmp := make([]corev1.Taint, 0, len(taintsToRemove))
+	for _, taintToRemove := range taintsToRemove {
+		// check whether the taint to remove even still exists on the node
+		if taints.TaintExists(node.Spec.Taints, &taintToRemove) {
+			tmp = append(tmp, taintToRemove)
+		}
+	}
+	taintsToRemove = tmp
+
 	_, newNodeTaints, err := taints.ReorganizeTaints(node, false, taintsToAdd, taintsToRemove)
 	if err != nil {
 		return err

pkg/nodes/tainter_test.go

@@ -120,6 +120,20 @@ func Test_tainter_Reconcile(t *testing.T) {
 			},
 			expectedAddedTaintsAnnotation: "",
 		},
+		{
+			name: "Removed taint stays in the list of taints (issue #10)",
+			args: args{
+				node: taintedNode([]string{"key2=value2:NoExecute"}),
+				configNodeTaints: []string{
+					"key2=value2:NoExecute-",
+					"key4=value4:NoExecute-", // simulate removal of a taint that was removed in a previous reconciliation
+				},
+			},
+			expectedTaints: []string{
+				"existingTaint=existingTaintValue:NoSchedule",
+			},
+			expectedAddedTaintsAnnotation: "",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {