Merge pull request #34 from canonical/OPENG-2653

Remove s3 bucket name configuration from coordinator
canonical · Sep 6, 2024 · 138f45f · 138f45f
2 parents c53f0e4 + 03ab34e
commit 138f45f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -19,4 +19,4 @@ cryptography
 # lib/charms/tempo_k8s/v1/tracing.py
 pydantic>=2
 # lib/charms/prometheus_k8s/v0/prometheus_scrape.py
-cosl>=0.0.26
+cosl>=0.0.29
diff --git a/src/charm.py b/src/charm.py
@@ -60,7 +60,6 @@ def __init__(self, *args):
         self.coordinator = Coordinator(
             charm=self,
             roles_config=TEMPO_ROLES_CONFIG,
-            s3_bucket_name=Tempo.s3_bucket_name,
             external_url=self._external_url,
             worker_metrics_port=self.tempo.tempo_http_server_port,
             endpoints={

diff --git a/src/tempo.py b/src/tempo.py
@@ -26,8 +26,6 @@ class Tempo:
     wal_path = "/etc/tempo/tempo_wal"
     metrics_generator_wal_path = "/etc/tempo/metrics_generator_wal"
 
-    s3_bucket_name = "tempo"
-
     memberlist_port = 7946
 
     server_ports: Dict[str, int] = {