fix: statuses were overriden in some cases

canonical · Oct 1, 2024 · 0f1162a · 0f1162a
1 parent bda1b9d
commit 0f1162a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/charm.py b/src/charm.py
@@ -647,6 +647,7 @@ def _on_upgrade(self, event: UpgradeCharmEvent):
             event.defer()
             return
 
+        self.status.set_and_share_status(ActiveStatus())
         self.upgrade._reconcile_upgrade(event)
 
         # Emit the post app upgrade event

diff --git a/src/k8s_upgrade.py b/src/k8s_upgrade.py
@@ -35,7 +35,7 @@
 )
 from charms.mongodb.v1.mongos import BalancerNotEnabledError, MongosConnection
 from lightkube.core.exceptions import ApiError
-from ops import ActiveStatus, MaintenanceStatus, StatusBase
+from ops import ActiveStatus, StatusBase
 from ops.charm import ActionEvent
 from ops.framework import EventBase, EventSource
 from ops.model import BlockedStatus, Unit
@@ -345,7 +345,7 @@ def _set_upgrade_status(self):
             self.charm.app.status = self._upgrade.app_status or ActiveStatus()
         # Set/clear upgrade unit status if no other unit status - upgrade status for units should
         # have the lowest priority.
-        if isinstance(self.charm.unit.status, (ActiveStatus, MaintenanceStatus)) or (
+        if isinstance(self.charm.unit.status, ActiveStatus) or (
             isinstance(self.charm.unit.status, BlockedStatus)
             and self.charm.unit.status.message.startswith(
                 "Rollback with `juju refresh`. Pre-upgrade check failed:"