Guardiola has agreed a two-year extension at the Etihad