[PodSetInfo] Skip duplicate Tolerations during merge. (#2498)

Author: trasc

pkg/podset/podset.go

@@ -108,7 +108,13 @@ func (podSetInfo *PodSetInfo) Merge(o PodSetInfo) error {
 	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.Tolerations = append(podSetInfo.Tolerations, o.Tolerations...)
+
+	// make sure we don't duplicate tolerations
+	for _, t := range o.Tolerations {
+		if slices.Index(podSetInfo.Tolerations, t) == -1 {
+			podSetInfo.Tolerations = append(podSetInfo.Tolerations, t)
+		}
+	}
 	return nil
 }
 

pkg/podset/podset_test.go

@@ -248,6 +248,40 @@ func TestMergeRestore(t *testing.T) {
 				Obj(),
 			wantRestoreChanges: true,
 		},
+		"don't duplicate tolerations": {
+			podSet: basePodSet.DeepCopy(),
+			info: PodSetInfo{
+				Annotations: map[string]string{
+					"a1": "a1v",
+				},
+				Labels: map[string]string{
+					"l1": "l1v",
+				},
+				NodeSelector: map[string]string{
+					"ns1": "ns1v",
+				},
+				Tolerations: []corev1.Toleration{
+					{
+						Key:      "t0",
+						Operator: corev1.TolerationOpEqual,
+						Value:    "t0v",
+						Effect:   corev1.TaintEffectNoSchedule,
+					},
+				},
+			},
+			wantPodSet: utiltesting.MakePodSet("", 1).
+				NodeSelector(map[string]string{"ns0": "ns0v", "ns1": "ns1v"}).
+				Labels(map[string]string{"l0": "l0v", "l1": "l1v"}).
+				Annotations(map[string]string{"a0": "a0v", "a1": "a1v"}).
+				Toleration(corev1.Toleration{
+					Key:      "t0",
+					Operator: corev1.TolerationOpEqual,
+					Value:    "t0v",
+					Effect:   corev1.TaintEffectNoSchedule,
+				}).
+				Obj(),
+			wantRestoreChanges: true,
+		},
 		"conflicting label": {
 			podSet: basePodSet.DeepCopy(),
 			info: PodSetInfo{

test/integration/controller/jobs/job/job_controller_test.go

@@ -627,6 +627,12 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				Queue(localQueue.Name).
 				Request(corev1.ResourceCPU, "5").
 				PodAnnotation("old-ann-key", "old-ann-value").
+				Toleration(corev1.Toleration{
+					Key:      "selector0",
+					Value:    "selector-value1",
+					Operator: corev1.TolerationOpEqual,
+					Effect:   corev1.TaintEffectNoSchedule,
+				}).
 				PodLabel("old-label-key", "old-label-value").
 				Obj()
 
@@ -668,6 +674,12 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 									"selector1": "selector-value1",
 								},
 								Tolerations: []corev1.Toleration{
+									{
+										Key:      "selector0",
+										Value:    "selector-value1",
+										Operator: corev1.TolerationOpEqual,
+										Effect:   corev1.TaintEffectNoSchedule,
+									},
 									{
 										Key:      "selector1",
 										Value:    "selector-value1",
@@ -708,6 +720,12 @@ var _ = ginkgo.Describe("Job controller", ginkgo.Ordered, ginkgo.ContinueOnFailu
 				gomega.Expect(createdJob.Spec.Template.Spec.NodeSelector).Should(gomega.HaveKeyWithValue("selector1", "selector-value1"))
 				gomega.Expect(createdJob.Spec.Template.Spec.Tolerations).Should(gomega.BeComparableTo(
 					[]corev1.Toleration{
+						{
+							Key:      "selector0",
+							Value:    "selector-value1",
+							Operator: corev1.TolerationOpEqual,
+							Effect:   corev1.TaintEffectNoSchedule,
+						},
 						{
 							Key:      "selector1",
 							Value:    "selector-value1",