Remove duplicate placements due to specifying with all & specific key

Rook creates some rook-ceph daemon's placement by merging the "all" and specific key placements. The OCS operator specifies the default OCS tolerations and node affinity in both the "all" key and the specific key leading to duplicated placements. To avoid this, skip specifying the default OCS tolerations and node affinity with the specific key. Signed-off-by: Malay Kumar Parida <[email protected]>
red-hat-storage · Jan 29, 2025 · a448739 · a448739
1 parent efb257c
commit a448739
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/controllers/defaults/placements.go b/controllers/defaults/placements.go
@@ -42,18 +42,12 @@ var (
 		},
 
 		"osd": {
-			Tolerations: []corev1.Toleration{
-				getOcsToleration(),
-			},
 			TopologySpreadConstraints: []corev1.TopologySpreadConstraint{
 				getTopologySpreadConstraintsSpec(1, []string{osdLabelSelector}),
 			},
 		},
 
 		"osd-prepare": {
-			Tolerations: []corev1.Toleration{
-				getOcsToleration(),
-			},
 			TopologySpreadConstraints: []corev1.TopologySpreadConstraint{
 				getTopologySpreadConstraintsSpec(1, []string{osdLabelSelector, osdPrepareLabelSelector}),
 			},

diff --git a/controllers/storagecluster/placement.go b/controllers/storagecluster/placement.go
@@ -62,7 +62,10 @@ func getPlacement(sc *ocsv1.StorageCluster, component string) rookCephv1.Placeme
 	// StorageCluster has no label selector, set the default node
 	// affinity.
 	if placement.NodeAffinity == nil && sc.Spec.LabelSelector == nil {
-		placement.NodeAffinity = defaults.DefaultNodeAffinity
+		// Don't add node affinity again for these rook-ceph daemons as it is already added via the "all" key
+		if component != "mgr" && component != "mon" && component != "osd" && component != "osd-prepare" {
+			placement.NodeAffinity = defaults.DefaultNodeAffinity
+		}
 	}
 
 	// If the StorageCluster specifies a label selector, append it to the