Merge PR #33175 into master

* refs/pull/33175/head:
	mgr/cephadm: Add some more type annotations
	mgr/orchestrator: unify StatelessServiceSpec and StatefulServiceSpec

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/pybind/mgr/cephadm/module.py
Simple merge

diff --cc src/pybind/mgr/orchestrator.py
Simple merge

diff --cc src/pybind/mgr/orchestrator_cli/module.py
Simple merge

diff --cc src/pybind/mgr/rook/module.py
Simple merge

diff --cc src/pybind/mgr/rook/rook_cluster.py
Simple merge

diff --cc src/pybind/mgr/test_orchestrator/module.py
Simple merge