Skip to content

Commit c005409

Browse files
Remove LDAP CA transferred check
1 parent 94c25c3 commit c005409

File tree

1 file changed

+2
-21
lines changed

1 file changed

+2
-21
lines changed

src/ldap.py

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111
LdapRequirer,
1212
LdapUnavailableEvent,
1313
)
14-
from charms.postgresql_k8s.v0.postgresql_tls import (
15-
TLS_TRANSFER_RELATION,
16-
)
1714
from ops import Relation
1815
from ops.framework import Object
19-
from ops.model import ActiveStatus, BlockedStatus
16+
from ops.model import ActiveStatus
2017

2118
logger = logging.getLogger(__name__)
2219

@@ -35,29 +32,13 @@ def __init__(self, charm, relation_name: str):
3532
self.framework.observe(self.ldap.on.ldap_ready, self._on_ldap_ready)
3633
self.framework.observe(self.ldap.on.ldap_unavailable, self._on_ldap_unavailable)
3734

38-
@property
39-
def ca_transferred(self) -> bool:
40-
"""Return whether the CA certificate has been transferred."""
41-
ca_transferred_relations = self.model.relations[TLS_TRANSFER_RELATION]
42-
43-
for relation in ca_transferred_relations:
44-
if relation.app.name == self._relation.app.name:
45-
return True
46-
47-
return False
48-
4935
@property
5036
def _relation(self) -> Relation:
5137
"""Return the relation object."""
5238
return self.model.get_relation(self.relation_name)
5339

54-
def _on_ldap_ready(self, event: LdapReadyEvent) -> None:
40+
def _on_ldap_ready(self, _: LdapReadyEvent) -> None:
5541
"""Handler for the LDAP ready event."""
56-
if not self.ca_transferred:
57-
self.charm.unit.status = BlockedStatus("LDAP insecure. Send LDAP server certificate")
58-
event.defer()
59-
return
60-
6142
logger.debug("Enabling LDAP connection")
6243
if self.charm.unit.is_leader():
6344
self.charm.app_peer_data.update({"ldap_enabled": "True"})

0 commit comments

Comments
 (0)