Merge PR #39435 into master

* refs/pull/39435/head:
	mgr/cephadm: redeploy daemons deployed using old image during upgrade
	mgr/cephadm: add container digests of mgr that deployed daemon to unit.meta

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>

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

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

diff --cc src/pybind/mgr/cephadm/upgrade.py
index 820b05396248a497cd3037ca4d74cf334132a913,92067a48ec681b38959c0a2ba244c04f37da5466..d3781ac38f3eac1eb37671dd7c0fd41995be841e
--- 1/src/pybind/mgr/cephadm/upgrade.py
--- 2/src/pybind/mgr/cephadm/upgrade.py
+++ b/src/pybind/mgr/cephadm/upgrade.py
@@@ -458,10 -449,10 +458,10 @@@ class CephadmUpgrade
          daemons = [d for d in self.mgr.cache.get_daemons() if d.daemon_type in CEPH_UPGRADE_ORDER]
          done = 0
          for daemon_type in CEPH_UPGRADE_ORDER:
 -            logger.info('Upgrade: Checking %s daemons' % daemon_type)
 +            logger.debug('Upgrade: Checking %s daemons' % daemon_type)
  
              need_upgrade_self = False
-             need_upgrade = []
+             need_upgrade: List[Tuple[DaemonDescription, bool]] = []
              for d in daemons:
                  if d.daemon_type != daemon_type:
                      continue