do not modify passed object

kubernetes-sigs · Oct 11, 2023 · 473d049 · 473d049
1 parent b853990
commit 473d049
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pkg/controller/jobframework/podsetinfo.go b/pkg/controller/jobframework/podsetinfo.go
@@ -41,16 +41,18 @@ func (podSetInfo *PodSetInfo) Merge(o PodSetInfo) error {
 	if err := utilmaps.HaveConflict(podSetInfo.Labels, o.Labels); err != nil {
 		return BadPodSetsUpdateError("labels", err)
 	}
-	maps.DeleteFunc(o.NodeSelector, func(k, v string) bool {
-		_, exists := o.NodeSelectorOverwrite[k]
-		return exists
-	})
-	if err := utilmaps.HaveConflict(podSetInfo.NodeSelector, o.NodeSelector); err != nil {
+	newNodeSelector := make(map[string]string)
+	for k, v := range o.NodeSelector {
+		if _, exists := podSetInfo.NodeSelectorOverwrite[k]; !exists {
+			newNodeSelector[k] = v
+		}
+	}
+	if err := utilmaps.HaveConflict(podSetInfo.NodeSelector, newNodeSelector); err != nil {
 		return BadPodSetsUpdateError("nodeSelector", err)
 	}
 	podSetInfo.Annotations = utilmaps.MergeKeepFirst(podSetInfo.Annotations, o.Annotations)
 	podSetInfo.Labels = utilmaps.MergeKeepFirst(podSetInfo.Labels, o.Labels)
-	podSetInfo.NodeSelector = utilmaps.MergeKeepFirst(podSetInfo.NodeSelector, o.NodeSelector)
+	podSetInfo.NodeSelector = utilmaps.MergeKeepFirst(podSetInfo.NodeSelector, newNodeSelector)
 	podSetInfo.Tolerations = append(podSetInfo.Tolerations, o.Tolerations...)
 	return nil
 }