Remove pebble patch_port, as this will be triggered at every containe…

…r restart
canonical · Apr 20, 2024 · 361ca51 · 361ca51
1 parent 1b50c01
commit 361ca51
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -348,7 +348,6 @@ def _on_pgbouncer_pebble_ready(self, event: PebbleReadyEvent) -> None:
         self.unit.set_workload_version(self.version)
 
         self.peers.unit_databag["container_initialised"] = "True"
-        self.patch_port()
 
     @property
     def is_container_ready(self) -> bool:

diff --git a/tests/integration/relations/pgbouncer_provider/test_pgbouncer_provider.py b/tests/integration/relations/pgbouncer_provider/test_pgbouncer_provider.py
@@ -498,8 +498,8 @@ async def test_indico_datatabase(ops_test: OpsTest) -> None:
             application_name="indico",
             num_units=1,
         )
-        await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-broker")
-        await ops_test.model.deploy("redis-k8s", channel="stable", application_name="redis-cache")
+        await ops_test.model.deploy("redis-k8s", channel="latest/edge", application_name="redis-broker")
+        await ops_test.model.deploy("redis-k8s", channel="latest/edge", application_name="redis-cache")
         await asyncio.gather(
             ops_test.model.relate("redis-broker", "indico:redis-broker"),
             ops_test.model.relate("redis-cache", "indico:redis-cache"),
@@ -533,6 +533,8 @@ async def test_connection_is_possible_after_pod_deletion(ops_test: OpsTest) -> N
     await delete_pod(ops_test, unit.name)
     await ops_test.model.wait_for_idle(status="active", idle_period=3)
 
+    await asyncio.sleep(20)
+
     # Test the connection.
     connection_string = await build_connection_string(
         ops_test, DATA_INTEGRATOR_APP_NAME, relation_name="postgresql", database="test-database"