[Bugfix] Improve Profile Tolerations Merge (#1877)

Author: ajanikow

CHANGELOG.md

@@ -13,6 +13,7 @@
 - (Feature) Promote RestartPolicy Always Feature
 - (Maintenance) Update Dependencies
 - (Feature) Backup Retry Until and BackupPolicy Until Propagation feature
+- (Bugfix) Improve Profile Tolerations Merge
 
 ## [1.2.47](https://github.com/arangodb/kube-arangodb/tree/1.2.47) (2025-03-28)
 - (Bugfix) Use Profile Annotations

pkg/apis/scheduler/v1beta1/pod/resources/scheduling.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -74,9 +74,9 @@ func (s *Scheduling) Apply(template *core.PodTemplateSpec) error {
 		}
 	}
 
-	template.Spec.Tolerations = tolerations.AddTolerationsIfNotFound(nil, s.Tolerations.DeepCopy()...)
+	template.Spec.Tolerations = tolerations.AddTolerationsIfNotFound(template.Spec.Tolerations, s.Tolerations.DeepCopy()...)
 
-	template.Spec.SchedulerName = util.WithDefault(s.SchedulerName)
+	template.Spec.SchedulerName = util.TypeOrDefault(s.SchedulerName, template.Spec.SchedulerName)
 
 	return nil
 }
@@ -134,7 +134,11 @@ func (s *Scheduling) With(other *Scheduling) *Scheduling {
 		current.NodeSelector = new.NodeSelector
 	} else if len(new.NodeSelector) > 0 {
 		for k, v := range new.NodeSelector {
-			current.NodeSelector[k] = v
+			if v == "-" {
+				delete(current.NodeSelector, k)
+			} else {
+				current.NodeSelector[k] = v
+			}
 		}
 	}
 
@@ -144,7 +148,7 @@ func (s *Scheduling) With(other *Scheduling) *Scheduling {
 	}
 
 	// Tolerations
-	current.Tolerations = tolerations.AddTolerationsIfNotFound(new.Tolerations, other.Tolerations...)
+	current.Tolerations = tolerations.AddTolerationsIfNotFound(current.Tolerations, new.Tolerations...)
 
 	// Affinity
 	current.Affinity = kresources.Merge(current.Affinity, new.Affinity)

pkg/apis/scheduler/v1beta1/pod/resources/scheduling_test.go

@@ -1,7 +1,7 @@
 //
 // DISCLAIMER
 //
-// Copyright 2024 ArangoDB GmbH, Cologne, Germany
+// Copyright 2024-2025 ArangoDB GmbH, Cologne, Germany
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -720,6 +720,31 @@ func Test_Scheduling_Tolerations(t *testing.T) {
 			require.EqualValues(t, 5, *pod.Spec.Tolerations[0].TolerationSeconds)
 		})
 	})
+	t.Run("Multi - Join", func(t *testing.T) {
+		applyScheduling(t, nil, &Scheduling{
+			Tolerations: Tolerations{
+				{
+					Key:      "A",
+					Operator: core.TolerationOpExists,
+				},
+			},
+		}, &Scheduling{
+			Tolerations: Tolerations{
+				{
+					Key:      "B",
+					Operator: core.TolerationOpExists,
+				},
+			},
+		})(func(t *testing.T, pod *core.PodTemplateSpec) {
+			require.Len(t, pod.Spec.Tolerations, 2)
+
+			require.EqualValues(t, core.TolerationOpExists, pod.Spec.Tolerations[0].Operator)
+			require.EqualValues(t, "A", pod.Spec.Tolerations[0].Key)
+
+			require.EqualValues(t, core.TolerationOpExists, pod.Spec.Tolerations[1].Operator)
+			require.EqualValues(t, "B", pod.Spec.Tolerations[1].Key)
+		})
+	})
 	t.Run("Multi - Update", func(t *testing.T) {
 		applyScheduling(t, nil, &Scheduling{
 			Tolerations: Tolerations{
@@ -806,6 +831,23 @@ func Test_Scheduling_NodeSelector(t *testing.T) {
 			require.Contains(t, pod.Spec.NodeSelector, "1")
 			require.EqualValues(t, pod.Spec.NodeSelector["1"], "2")
 
+			require.Contains(t, pod.Spec.NodeSelector, "2")
+			require.EqualValues(t, pod.Spec.NodeSelector["2"], "1")
+		})
+	})
+	t.Run("Remove", func(t *testing.T) {
+		applyScheduling(t, nil, &Scheduling{
+			NodeSelector: map[string]string{
+				"1": "1",
+			},
+		}, &Scheduling{
+			NodeSelector: map[string]string{
+				"2": "1",
+				"1": "-",
+			},
+		})(func(t *testing.T, pod *core.PodTemplateSpec) {
+			require.Len(t, pod.Spec.NodeSelector, 1)
+
 			require.Contains(t, pod.Spec.NodeSelector, "2")
 			require.EqualValues(t, pod.Spec.NodeSelector["2"], "1")
 		})