add labelZoneFailureDomainWithoutBeta label

Signed-off-by: Oded Viner <oviner@redhat.com>
red-hat-storage · Oct 13, 2024 · 5a4c471 · 5a4c471
1 parent 3939e03
commit 5a4c471
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/controllers/storagecluster/topology.go b/controllers/storagecluster/topology.go
@@ -100,7 +100,7 @@ func setFailureDomain(sc *ocsv1.StorageCluster) {
  // If sufficient zones are available then we select zone as the failure domain
  topologyMap := sc.Status.NodeTopologies
  for label, labelValues := range topologyMap.Labels {
- if label == corev1.LabelZoneFailureDomainStable {
+ if label == corev1.LabelZoneFailureDomainStable || label == labelZoneFailureDomainWithoutBeta {
  if (len(labelValues) >= 2 && arbiterEnabled(sc)) || (len(labelValues) >= 3) {
  failureDomain = "zone"
  }
@@ -135,7 +135,7 @@ func determinePlacementRack(
  targetAZ := ""
  for label, value := range node.Labels {
  for _, key := range validTopologyLabelKeys {
- if strings.Contains(label, key) && label == corev1.LabelZoneFailureDomainStable {
+ if strings.Contains(label, key) && (label == corev1.LabelZoneFailureDomainStable || label == labelZoneFailureDomainWithoutBeta) {
  targetAZ = value
  break
  }
@@ -159,7 +159,7 @@ func determinePlacementRack(
  if n.Name == nodeName {
  for label, value := range n.Labels {
  for _, key := range validTopologyLabelKeys {
- if strings.Contains(label, key) && label == corev1.LabelZoneFailureDomainStable && value == targetAZ {
+ if strings.Contains(label, key) && (label == corev1.LabelZoneFailureDomainStable || label == labelZoneFailureDomainWithoutBeta) && value == targetAZ {
  validRack = true
  break
  }