Merge pull request ceph#62299 from thegreenbear/cephadm-sd-fix-haproxy-labels

src/pybind/mgr/cephadm/service_discovery: fixed HAProxy labels

Reviewed-by: Adam King <[email protected]>
Reviewed-by: Afreen Misbah <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/service_discovery.py

@@ -228,7 +228,7 @@ def haproxy_sd_config(self) -> List[Dict[str, Collection[str]]]:
                     addr = self.mgr.inventory.get_addr(dd.hostname)
                     srv_entries.append({
                         'targets': [f"{build_url(host=addr, port=spec.monitor_port).lstrip('/')}"],
-                        'labels': {'instance': dd.service_name()}
+                        'labels': {'ingress': dd.service_name(), 'instance': dd.hostname}
                     })
         return srv_entries
 

src/pybind/mgr/cephadm/tests/test_service_discovery.py

@@ -170,7 +170,8 @@ def test_get_sd_config_haproxy(self):
 
         # check content
         assert cfg[0]['targets'] == ['1.2.3.4:9049']
-        assert cfg[0]['labels'] == {'instance': 'ingress'}
+        assert cfg[0]['labels'] == {'instance': 'node0', 'ingress': 'ingress'}
+        assert cfg[1]['labels'] == {'instance': 'node1', 'ingress': 'ingress'}
 
     def test_get_sd_config_ceph_exporter(self):
         mgr = FakeMgr()