In this paper we determine the torsion free rank of the group of endotrivial modules for any finite group of Lie type, in both defining and non-defining characteristic. On our way to proving this, we classify the maximal rank $2$ elementary abelian $\ell$-subgroups in any finite group of Lie type, for any prime $\ell$, which may be of independent interest.