Results on soft and hard diffraction obtained by the CDF
Collaboration in Run I of the Fermilab Tevatron p anti-p collider are reviewed
and compared with results from the DESY ep collider HERA and with
theoretical expectations.  In addition, the CDF program for diffractive
studies in Run II is briefly reviewed with emphasis on the relevant detector
upgrades and physics goals.