From 6bf205b1909c6b5e01e7211df4106476e7208dfc Mon Sep 17 00:00:00 2001 From: Alexander Kukushkin Date: Tue, 2 Feb 2021 11:47:46 +0100 Subject: [PATCH] Don't use bypass_api_service when running patronictl (#1830) It could happen that the cluster role wither not configured or doesn't provide enough permissions. In this case bypass_api_service is ignored, but the warning is logged, which is rather annoying when patronictl is used. Since the bypass_api_service is most useful for Patroni, we will simply ignore it when patronictl is used. --- patroni/dcs/kubernetes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patroni/dcs/kubernetes.py b/patroni/dcs/kubernetes.py index 54e6fbef..a0a08978 100644 --- a/patroni/dcs/kubernetes.py +++ b/patroni/dcs/kubernetes.py @@ -631,7 +631,8 @@ class Kubernetes(AbstractDCS): port.update({n: p[n] for n in ('name', 'protocol') if p.get(n)}) self.__ports.append(k8s_client.V1EndpointPort(**port)) - self._api = CoreV1ApiProxy(config.get('use_endpoints'), config.get('bypass_api_service')) + bypass_api_service = not config.get('patronictl') and config.get('bypass_api_service') + self._api = CoreV1ApiProxy(config.get('use_endpoints'), bypass_api_service) self._should_create_config_service = self._api.use_endpoints self.reload_config(config) # leader_observed_record, leader_resource_version, and leader_observed_time are used only for leader race!