cinder-csi-plugin: Use generated VolumeContext

Looks like an oversight in commit 7bfb2eb.

Signed-off-by: Stephen Finucane <[email protected]>

Author: stephenfin

pkg/csi/cinder/controllerserver.go

@@ -208,7 +208,7 @@ func (cs *controllerServer) CreateVolume(ctx context.Context, req *csi.CreateVol
 
 	// Set scheduler hints if affinity or anti-affinity is set in PVC annotations
 	var schedulerHints volumes.SchedulerHintOptsBuilder
-	var volCtx map[string]string
+	volCtx := map[string]string{}
 	affinity := pvcAnnotations[affinityKey]
 	antiAffinity := pvcAnnotations[antiAffinityKey]
 	if affinity != "" || antiAffinity != "" {
@@ -1059,10 +1059,9 @@ func getTopology(vol *volumes.Volume, topologyReq *csi.TopologyRequirement, igno
 
 func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, accessibleTopology []*csi.Topology) *csi.CreateVolumeResponse {
 	var volsrc *csi.VolumeContentSource
-	volCnx := map[string]string{}
 
 	if vol.SnapshotID != "" {
-		volCnx[ResizeRequired] = "true"
+		volCtx[ResizeRequired] = "true"
 
 		volsrc = &csi.VolumeContentSource{
 			Type: &csi.VolumeContentSource_Snapshot{
@@ -1074,7 +1073,7 @@ func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, acce
 	}
 
 	if vol.SourceVolID != "" {
-		volCnx[ResizeRequired] = "true"
+		volCtx[ResizeRequired] = "true"
 
 		volsrc = &csi.VolumeContentSource{
 			Type: &csi.VolumeContentSource_Volume{
@@ -1086,7 +1085,7 @@ func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, acce
 	}
 
 	if vol.BackupID != nil && *vol.BackupID != "" {
-		volCnx[ResizeRequired] = "true"
+		volCtx[ResizeRequired] = "true"
 
 		volsrc = &csi.VolumeContentSource{
 			Type: &csi.VolumeContentSource_Snapshot{
@@ -1103,7 +1102,7 @@ func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, acce
 			CapacityBytes:      int64(vol.Size * 1024 * 1024 * 1024),
 			AccessibleTopology: accessibleTopology,
 			ContentSource:      volsrc,
-			VolumeContext:      volCnx,
+			VolumeContext:      volCtx,
 		},
 	}