From b64eaa953c5927f2098798bb81e4169ee46c349a Mon Sep 17 00:00:00 2001
From: iltyty <qiuyh0924@163.com>
Date: Mon, 6 Jan 2025 16:46:32 +0800
Subject: [PATCH] feat(disk): add region and zone labels to disk PV

---
 pkg/disk/disk.go  | 4 +++-
 pkg/disk/utils.go | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/disk/disk.go b/pkg/disk/disk.go
index af49e0acd..9a4663531 100644
--- 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
index 5c8f65cc3..3db25dd0b 100644
--- 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