fix(instance): wait for volumes to be available before deletion (#4388)

Author: Codelax

internal/namespaces/instance/v1/custom_server_delete.go

@@ -234,9 +234,11 @@ func serverDeleteVolume(volume *instance.VolumeServer, instanceAPI *instance.API
 	var err error
 
 	if volume.VolumeType == instance.VolumeServerVolumeTypeSbsVolume {
+		volumeAvailable := block.VolumeStatusAvailable
 		_, err = blockAPI.WaitForVolumeAndReferences(&block.WaitForVolumeAndReferencesRequest{
-			Zone:     volume.Zone,
-			VolumeID: volume.ID,
+			Zone:                 volume.Zone,
+			VolumeID:             volume.ID,
+			VolumeTerminalStatus: &volumeAvailable,
 		})
 		if err != nil {
 			return errorDeletingResource(err)