feat(disk): add region and zone labels to disk PV

kubernetes-sigs · Jan 7, 2025 · b64eaa9 · b64eaa9
1 parent a3d455c
commit b64eaa9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
@@ -47,7 +47,9 @@ import (
 const (
 	driverType              = "disk"
 	driverName              = "diskplugin.csi.alibabacloud.com"
-	TopologyZoneKey         = "topology." + driverName + "/zone"
+	TopologyKey             = "topology." + driverName
+	TopologyRegionKey       = TopologyKey + "/region"
+	TopologyZoneKey         = TopologyKey + "/zone"
 	TopologyMultiZonePrefix = TopologyZoneKey + "-"
 )
 

diff --git a/pkg/disk/utils.go b/pkg/disk/utils.go
@@ -951,10 +951,12 @@ func patchForNode(node *v1.Node, maxVolumesNum int, diskTypes []string) []byte {
 func volumeCreate(attempt createAttempt, diskID string, volSizeBytes int64, volumeContext map[string]string, zoneID string, contextSource *csi.VolumeContentSource) *csi.Volume {
 	segments := map[string]string{}
 	cateDesc := AllCategories[attempt.Category]
+	volumeContext[labelAppendPrefix+TopologyRegionKey] = GlobalConfigVar.Region
 	if cateDesc.Regional {
 		segments[common.TopologyKeyRegion] = GlobalConfigVar.Region
 	} else {
 		segments[TopologyZoneKey] = zoneID
+		volumeContext[labelAppendPrefix+TopologyZoneKey] = zoneID
 	}
 	if attempt.Instance != "" {
 		segments[common.ECSInstanceIDTopologyKey] = attempt.Instance