cinder-csi-plugin: Don't set segment with empty topology value

stephenfin · stephenfin · commit 78de34d27116 · 2025-03-24T18:03:12.000Z
This is actually handled by csi-provisioner, but it's arguably
incorrect.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git a/pkg/csi/cinder/controllerserver.go b/pkg/csi/cinder/controllerserver.go
@@ -1080,7 +1080,7 @@ func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, igno
 		if accessibleTopologyReq != nil {
 			accessibleTopology = accessibleTopologyReq.GetPreferred()
 		}
-	} else {
+	} else if vol.AvailabilityZone != "" {
 		accessibleTopology = []*csi.Topology{
 			{
 				Segments: map[string]string{topologyKey: vol.AvailabilityZone},

Original file line number	Diff line number	Diff line change
`@@ -1080,7 +1080,7 @@ func getCreateVolumeResponse(vol *volumes.Volume, volCtx map[string]string, igno`
`1080`	`1080`	`if accessibleTopologyReq != nil {`
`1081`	`1081`	`accessibleTopology = accessibleTopologyReq.GetPreferred()`
`1082`	`1082`	`}`
`1083`		`- } else {`
	`1083`	`+ } else if vol.AvailabilityZone != "" {`
`1084`	`1084`	`accessibleTopology = []*csi.Topology{`
`1085`	`1085`	`{`
`1086`	`1086`	`Segments: map[string]string{topologyKey: vol.AvailabilityZone},`