Skip to content

Commit

Permalink
refactor: update info on update-status event
Browse files Browse the repository at this point in the history
  • Loading branch information
natalian98 committed Feb 13, 2024
1 parent 215d2e1 commit 587e18c
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
PebbleReadyEvent,
RelationChangedEvent,
RemoveEvent,
UpdateStatusEvent,
)
from ops.main import main
from ops.model import (
Expand Down Expand Up @@ -145,6 +146,7 @@ def __init__(self, *args):
self.framework.observe(self.on.oathkeeper_pebble_ready, self._on_oathkeeper_pebble_ready)
self.framework.observe(self.on.install, self._on_install)
self.framework.observe(self.on.config_changed, self._on_config_changed)
self.framework.observe(self.on.update_status, self._on_update_status)
self.framework.observe(self.on.remove, self._on_remove)

self.framework.observe(
Expand Down Expand Up @@ -418,11 +420,13 @@ def _on_oathkeeper_pebble_ready(self, event: PebbleReadyEvent) -> None:
"""Event Handler for pebble ready event."""
self._patch_statefulset()
self._handle_status_update_config(event)
self._update_oathkeeper_info_relation_data(event)

def _on_config_changed(self, event: ConfigChangedEvent):
self.forward_auth.update_forward_auth_config(self._forward_auth_config)

def _on_update_status(self, event: UpdateStatusEvent) -> None:
self._update_oathkeeper_info_relation_data(event)

def _on_remove(self, event: RemoveEvent) -> None:
if not self.unit.is_leader():
return
Expand All @@ -435,6 +439,8 @@ def _on_kratos_relation_changed(self, event: RelationChangedEvent) -> None:
def _on_oathkeeper_info_relation_ready(
self, event: OathkeeperInfoRelationCreatedEvent
) -> None:
self._update_oathkeeper_info_relation_data(event)

if not self._container.can_connect():
logger.info(f"Cannot connect to Oathkeeper container. Deferring the {event} event.")
event.defer()
Expand All @@ -446,7 +452,6 @@ def _on_oathkeeper_info_relation_ready(
patch = {"data": {"admin_ui_rules.json": ""}}
self.access_rules_configmap.patch(patch=patch, cm_name="access-rules")

self._update_oathkeeper_info_relation_data(event)
self._handle_status_update_config(event)

def _on_ingress_ready(self, event: IngressPerAppReadyEvent) -> None:
Expand Down

0 comments on commit 587e18c

Please sign in to comment.