Pep Guardiola has signed a new two-year contract with Manchester City.