Merge branch 'main' into update-charmcraft-builder

discourse_rock/rockcraft.yaml

@@ -5,7 +5,7 @@ name: discourse
 summary: Discourse rock
 description: Discourse OCI image for the Discourse charm
 base: [email protected]
-# renovate: base: ubuntu:22.04@sha256:6042500cf4b44023ea1894effe7890666b0c5c7871ed83a97c36c76ae560bb9b
+# renovate: base: ubuntu:22.04@sha256:a2bbdf79d03f6d4171bbd6ebb4782f6229375951987d3427ec3d9373f9841cd7
 run-user: _daemon_  # UID/GID 584792
 license: Apache-2.0
 version: "1.0"

src/charm.py

@@ -123,7 +123,7 @@ def __init__(self, *args):
         self._grafana_dashboards = GrafanaDashboardProvider(self)
 
         self.restart_manager = RollingOpsManager(
-            charm=self, relation="restart", callback=self._setup_and_activate
+            charm=self, relation="restart", callback=self._on_rolling_restart
         )
 
     def _on_start(self, _: ops.StartEvent) -> None:
@@ -193,6 +193,14 @@ def _on_config_changed(self, _: HookEvent) -> None:
         """
         self._configure_pod()
 
+    def _on_rolling_restart(self, _: ops.EventBase) -> None:
+        """Handle rolling restart event.
+
+        Args:
+            event: Event triggering the discourse rolling restart event handler.
+        """
+        self._setup_and_activate()
+
     def _setup_and_activate(self) -> None:
         """Set up discourse, configure the pod and eventually activate the charm."""
         if not self._is_setup_completed():