When did the French rule in Vietnam come to an end?

1954

The correct answer is Option 2 - 1954

1954: Defeat of the French by the Vietnamese at Dien Bien Phu. With this, French rule came to an end in Vietnam.

Events of 1954 in International Politics:

-Defeat of the French by the Vietnamese at Dien Bien Phu
-Signing of the Geneva Accords
-Division of Vietnam along the 17th Parallel
-Formation of SEATO