fix: register wth taints can be specified multiple times

Author: faiq

pkg/handlers/generic/mutation/taints/inject_worker.go

@@ -119,26 +119,11 @@ func (h *taintsWorkerPatchHandler) Mutate(
 			var runtimeConfigFromNodeadm *runtime.RawExtension
 			var flags []string
 			newTaints := toEKSConfigTaints(taintsVar)
-			hasRegisterTaintsFlag := false
 			if kubeletOptions != nil {
 				runtimeConfigFromNodeadm = kubeletOptions.Config
-				for _, flag := range kubeletOptions.Flags {
-					if strings.HasPrefix(flag, "--register-with-taints=") {
-						hasRegisterTaintsFlag = true
-						existingTaints := strings.Split(flag, "--register-with-taints=")
-						if len(existingTaints) != 2 {
-							return fmt.Errorf("expected flag register-with-taints to be able to split got %v", existingTaints)
-						}
-						taintsFromFlags := existingTaints[1]
-						flags = append(flags, fmt.Sprintf("--register-with-taints=%s,%s", taintsFromFlags, newTaints))
-						continue
-					}
-					flags = append(flags, flag)
-				}
-			}
-			if !hasRegisterTaintsFlag {
-				flags = append(flags, fmt.Sprintf("--register-with-taints=%s", newTaints))
+				flags = kubeletOptions.Flags
 			}
+			flags = append(flags, fmt.Sprintf("--register-with-taints=%s", newTaints))
 			obj.Spec.Template.Spec.Kubelet = &eksbootstrapv1.KubeletOptions{
 				Flags:  flags,
 				Config: runtimeConfigFromNodeadm,

pkg/handlers/generic/mutation/taints/inject_worker_test.go

@@ -155,9 +155,9 @@ var _ = Describe("Generate taints patches for Worker", func() {
 				},
 			}),
 			ExpectedPatchMatchers: []capitest.JSONPatchMatcher{{
-				Operation:    "replace",
-				Path:         "/spec/template/spec/kubelet/flags/0",
-				ValueMatcher: gomega.Equal("--register-with-taints=key1=value1:NoSchedule,key=value:NoExecute"),
+				Operation:    "add",
+				Path:         "/spec/template/spec/kubelet/flags/1",
+				ValueMatcher: gomega.Equal("--register-with-taints=key=value:NoExecute"),
 			}},
 		},
 	}