From 482fd0c49b4f6e66518d5ffbaca3785d4d3ebf2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jose=20C=2E=20Mass=C3=B3n?= Date: Thu, 14 Dec 2023 14:16:08 -0300 Subject: [PATCH] address Leon's comments --- src/charm.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/charm.py b/src/charm.py index 941d767..5f9ecfb 100755 --- a/src/charm.py +++ b/src/charm.py @@ -136,7 +136,6 @@ def _on_server_cert_changed(self, _): def publish_config(self, tls: bool = False): """Generate config file and publish to all workers.""" mimir_config = self.coordinator.build_config(dict(self.config), tls=tls) - logger.warning(mimir_config) self.cluster_provider.publish_configs(mimir_config) def _on_mimir_cluster_changed(self, _): @@ -200,17 +199,11 @@ def _update_cert(self): self.server_cert.ca, # pyright: ignore make_dirs=True, ) - # FIXME with the update-ca-certificates machinery prometheus shouldn't need - # CA_CERT_PATH. self._nginx_container.push( CA_CERT_PATH, self.server_cert.ca, # pyright: ignore make_dirs=True, ) - - # Repeat for the charm container. We need it there for prometheus client requests. - ca_cert_path.parent.mkdir(exist_ok=True, parents=True) - ca_cert_path.write_text(self.server_cert.ca) # pyright: ignore else: self._nginx_container.remove_path(CERT_PATH, recursive=True) self._nginx_container.remove_path(KEY_PATH, recursive=True)