Adjust Node Label Conditions Based on Full Label Name

The OCS operator searches for the topology.kubernetes.io/zone label key using a string containing logic. If the customer has a node with a label that includes the string zone. The OCS operator can read another label containing 'zone' instead of topology.kubernetes.io/zone. Signed-off-by: Oded Viner <[email protected]>
red-hat-storage · Oct 14, 2024 · 4d3a134 · 4d3a134
1 parent f80f43b
commit 4d3a134
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 strings.Contains(label, "zone") {
+		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) && strings.Contains(label, "zone") {
+			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) && strings.Contains(label, "zone") && value == targetAZ {
+								if strings.Contains(label, key) && (label == corev1.LabelZoneFailureDomainStable || label == labelZoneFailureDomainWithoutBeta) && value == targetAZ {
 									validRack = true
 									break
 								}