Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: red-hat-storage/ocs-operator
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 739e80424b3842aa72c04f55d4d4f39d101c32f8
Choose a base ref
..
head repository: red-hat-storage/ocs-operator
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ed1c74d1877ff7c2724e5843b2a4038ed578ac13
Choose a head ref
Showing with 3 additions and 3 deletions.
  1. +3 −3 controllers/storagecluster/cephcluster.go
6 changes: 3 additions & 3 deletions controllers/storagecluster/cephcluster.go
Original file line number Diff line number Diff line change
@@ -824,10 +824,10 @@ func newStorageClassDeviceSets(sc *ocsv1.StorageCluster) []rookCephv1.StorageCla
}

// Add default TSCs if not set to ensure even distribution of OSDs across nodes
if !noPlacement && noPlacementTsc {
if len(placement.TopologySpreadConstraints) == 0 {
placement.TopologySpreadConstraints = append(placement.TopologySpreadConstraints, defaults.DaemonPlacements["osd"].TopologySpreadConstraints...)
}
if !noPreparePlacement && noPreparePlacementTsc {
if len(preparePlacement.TopologySpreadConstraints) == 0 {
preparePlacement.TopologySpreadConstraints = append(preparePlacement.TopologySpreadConstraints, defaults.DaemonPlacements["osd-prepare"].TopologySpreadConstraints...)
}

@@ -841,7 +841,7 @@ func newStorageClassDeviceSets(sc *ocsv1.StorageCluster) []rookCephv1.StorageCla
// If topologyKey is not host, append additional topology spread constraint to the
// default preparePlacement. This serves even distribution at the host level
// within a failure domain (zone/rack).
if noPreparePlacementTsc {
if noPlacementTsc && noPreparePlacementTsc {
if topologyKey != corev1.LabelHostname {
addStrictFailureDomainTSC(&preparePlacement, topologyKey)
} else {