Add topology.kubernetes.io/zone if topology.bsu.outscale.com/zone not…

… found
outscale · Sep 18, 2023 · 935460f · 935460f
1 parent 8be720e
commit 935460f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/pkg/driver/controller.go b/pkg/driver/controller.go
@@ -534,12 +534,20 @@ func pickAvailabilityZone(requirement *csi.TopologyRequirement) string {
 		if exists {
 			return zone
 		}
+		zone, exists = topology.GetSegments()[TopologyK8sKey]
+		if exists {
+			return zone
+		}
 	}
 	for _, topology := range requirement.GetRequisite() {
 		zone, exists := topology.GetSegments()[TopologyKey]
 		if exists {
 			return zone
 		}
+		zone, exists = topology.GetSegments()[TopologyK8sKey]
+		if exists {
+			return zone
+		}
 	}
 	return ""
 }

diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go
@@ -41,8 +41,9 @@ const (
 )
 
 const (
-	DriverName  = "bsu.csi.outscale.com"
-	TopologyKey = "topology." + DriverName + "/zone"
+	DriverName     = "bsu.csi.outscale.com"
+	TopologyKey    = "topology." + DriverName + "/zone"
+	TopologyK8sKey = "topology.kubernetes.io/zone"
 )
 
 type Driver struct {