Goaltender Marc-Andre Fleury has agreed to a three-year, $21 million extension that keeps him with the Golden Knights through the 2021-22 season.