From: Redouane Kachach Date: Thu, 18 Sep 2025 08:27:58 +0000 (+0200) Subject: mgr/cephadm: Include mgmt-gateway/oauth2-proxy in upgrade process X-Git-Tag: testing/wip-vshankar-testing-20250929.160013-debug~21^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=a53f397770dbc6022a803fe11c5e4f5152bbf991;p=ceph-ci.git mgr/cephadm: Include mgmt-gateway/oauth2-proxy in upgrade process Add the new mgmt-gateway and oauth2-proxy services to the list of services upgraded by cephadm, ensuring they are updated alongside the rest of the cephadm-managed services. Signed-off-by: Redouane Kachach --- diff --git a/src/pybind/mgr/cephadm/utils.py b/src/pybind/mgr/cephadm/utils.py index bc509904c24..9ef394e86dc 100644 --- a/src/pybind/mgr/cephadm/utils.py +++ b/src/pybind/mgr/cephadm/utils.py @@ -27,9 +27,10 @@ CEPH_TYPES = ['mgr', 'mon', 'crash', 'osd', 'mds', 'rgw', GATEWAY_TYPES = ['iscsi', 'nfs', 'nvmeof', 'smb'] MONITORING_STACK_TYPES = ['node-exporter', 'prometheus', 'alertmanager', 'grafana', 'loki', 'promtail', 'alloy'] +MGMT_GATEWAY_STACK_TYPES = ['mgmt-gateway', 'oauth2-proxy'] RESCHEDULE_FROM_OFFLINE_HOSTS_TYPES = ['haproxy', 'nfs'] -CEPH_UPGRADE_ORDER = CEPH_TYPES + GATEWAY_TYPES + MONITORING_STACK_TYPES +CEPH_UPGRADE_ORDER = CEPH_TYPES + GATEWAY_TYPES + MONITORING_STACK_TYPES + MGMT_GATEWAY_STACK_TYPES # these daemon types use the ceph container image CEPH_IMAGE_TYPES = CEPH_TYPES + ['iscsi', 'nfs', 'node-proxy'] @@ -37,7 +38,7 @@ CEPH_IMAGE_TYPES = CEPH_TYPES + ['iscsi', 'nfs', 'node-proxy'] # these daemons do not use the ceph image. There are other daemons # that also don't use the ceph image, but we only care about those # that are part of the upgrade order here -NON_CEPH_IMAGE_TYPES = MONITORING_STACK_TYPES + ['nvmeof', 'smb'] +NON_CEPH_IMAGE_TYPES = MONITORING_STACK_TYPES + ['nvmeof', 'smb'] + MGMT_GATEWAY_STACK_TYPES # Used for _run_cephadm used for check-host etc that don't require an --image parameter cephadmNoImage = CephadmNoImage.token