fix: update charm dependent libs

Author: canonical-iam

lib/charms/observability_libs/v0/kubernetes_compute_resources_patch.py

@@ -149,7 +149,7 @@ def setUp(self, *unused):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 8
+LIBPATCH = 9
 
 
 _Decimal = Union[Decimal, float, str, int]  # types that are potentially convertible to Decimal
@@ -584,6 +584,14 @@ def __init__(
                 will be observed to re-apply the patch.
         """
         super().__init__(charm, "{}_{}".format(self.__class__.__name__, container_name))
+
+        if container_name == "charm":
+            raise ValueError(
+                "Starting with juju 3.6.9, juju manages the charm container "
+                "constraints and you'll get errors by doing this if the charm is deployed "
+                "on higher juju versions."
+            )
+
         self._charm = charm
         self._container_name = container_name
         self.resource_reqs_func = resource_reqs_func
@@ -606,7 +614,7 @@ def __init__(
     def _on_config_changed(self, _):
         self._patch()
 
-    def _patch(self) -> None:
+    def _patch(self) -> None: # noqa: C901
         """Patch the Kubernetes resources created by Juju to limit cpu or mem.
 
         This method will keep on retrying to patch the kubernetes resource for a default duration of 20 seconds
@@ -657,7 +665,9 @@ def _patch(self) -> None:
         except ApiError as e:
             if e.status.code == 403:
                 msg = f"Kubernetes resources patch failed: `juju trust` this application. {e}"
-
+            elif e.status.code == 409:
+                msg = (f"Kubernetes resources patch failed: someone else (likely juju) "
+                       f"owns the resources you're trying to patch {e}")
             else:
                 msg = f"Kubernetes resources patch failed: {e}"
 

lib/charms/traefik_k8s/v2/ingress.py

@@ -84,7 +84,7 @@ def _on_ingress_revoked(self, event: IngressPerAppRevokedEvent):
 
 # Increment this PATCH version before using `charmcraft publish-lib` or reset
 # to 0 if you are raising the major API version
-LIBPATCH = 16
+LIBPATCH = 17
 
 PYDEPS = ["pydantic"]
 
@@ -456,11 +456,16 @@ class IngressPerAppDataRemovedEvent(RelationEvent):
     """Event representing that ingress data has been removed for an app."""
 
 
+class IngressPerAppEndpointsUpdatedEvent(RelationEvent):
+    """Event representing that the proxied endpoints have been updated."""
+
+
 class IngressPerAppProviderEvents(ObjectEvents):
     """Container for IPA Provider events."""
 
     data_provided = EventSource(IngressPerAppDataProvidedEvent)
     data_removed = EventSource(IngressPerAppDataRemovedEvent)
+    endpoints_updated = EventSource(IngressPerAppEndpointsUpdatedEvent)
 
 
 @dataclass
@@ -508,7 +513,7 @@ def _handle_relation(self, event):
             )
 
     def _handle_relation_broken(self, event):
-        self.on.data_removed.emit(event.relation)  # type: ignore
+        self.on.data_removed.emit(event.relation, event.relation.app)  # type: ignore
 
     def wipe_ingress_data(self, relation: Relation):
         """Clear ingress data from relation."""
@@ -523,6 +528,7 @@ def wipe_ingress_data(self, relation: Relation):
             )
             return
         del relation.data[self.app]["ingress"]
+        self.on.endpoints_updated.emit(relation=relation, app=relation.app)
 
     def _get_requirer_units_data(self, relation: Relation) -> List["IngressRequirerUnitData"]:
         """Fetch and validate the requirer's unit databag."""
@@ -556,7 +562,9 @@ def get_data(self, relation: Relation) -> IngressRequirerData:
                 self._get_requirer_app_data(relation), self._get_requirer_units_data(relation)
             )
         except (pydantic.ValidationError, DataValidationError) as e:
-            raise DataValidationError("failed to validate ingress requirer data") from e
+            raise DataValidationError(
+                "failed to validate ingress requirer data: %s" % str(e)
+            ) from e
 
     def is_ready(self, relation: Optional[Relation] = None):
         """The Provider is ready if the requirer has sent valid data."""
@@ -566,7 +574,7 @@ def is_ready(self, relation: Optional[Relation] = None):
         try:
             self.get_data(relation)
         except (DataValidationError, NotReadyError) as e:
-            log.debug("Provider not ready; validation error encountered: %s" % str(e))
+            log.info("Provider not ready; validation error encountered: %s" % str(e))
             return False
         return True
 
@@ -591,6 +599,7 @@ def publish_url(self, relation: Relation, url: str):
         ingress_url = {"url": url}
         try:
             IngressProviderAppData(ingress=ingress_url).dump(relation.data[self.app])  # type: ignore
+            self.on.endpoints_updated.emit(relation=relation, app=relation.app)
         except pydantic.ValidationError as e:
             # If we cannot validate the url as valid, publish an empty databag and log the error.
             log.error(f"Failed to validate ingress url '{url}' - got ValidationError {e}")
@@ -756,7 +765,7 @@ def _handle_relation(self, event):
 
     def _handle_relation_broken(self, event):
         self._stored.current_url = None  # type: ignore
-        self.on.revoked.emit(event.relation)  # type: ignore
+        self.on.revoked.emit(relation=event.relation, app=event.relation.app)  # type: ignore
 
     def _handle_upgrade_or_leader(self, event):
         """On upgrade/leadership change: ensure we publish the data we have."""