IEA estimates that oil demand will continue to increase until 2029. However, they also estimate oil production capacity will increase even faster than demand, leaving a glut of spare capacity.
I think predictions that far in advance are bound to be wrong in one direction or the other, but it is an interesting analysis. Archive link to WSJ: