Joshua Kimmich is set to see out an already decorated career at Bayern Munich, after signing a new deal with the club.