Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert to an earlier lib version to support TLS #250

Open
wants to merge 2 commits into
base: 6/edge
Choose a base branch
from
Open

revert to an earlier lib version to support TLS #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c02276
revert to an earlier lib version to support TLS
MiaAltieri May 16, 2024
fa89b9f
use former tls certificates interface
MiaAltieri May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions lib/charms/mongodb/v0/mongodb_tls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
import socket
from typing import List, Optional, Tuple

from charms.tls_certificates_interface.v3.tls_certificates import (
from charms.tls_certificates_interface.v1.tls_certificates import (
CertificateAvailableEvent,
CertificateExpiringEvent,
TLSCertificatesRequiresV3,
TLSCertificatesRequiresV1,
generate_csr,
generate_private_key,
)
Expand All @@ -39,7 +39,8 @@

# Increment this PATCH version before using `charmcraft publish-lib` or reset
# to 0 if you are raising the major API version
LIBPATCH = 6
LIBPATCH = 5


logger = logging.getLogger(__name__)

Expand All @@ -53,7 +54,7 @@ def __init__(self, charm, peer_relation, substrate):
self.charm = charm
self.substrate = substrate
self.peer_relation = peer_relation
self.certs = TLSCertificatesRequiresV3(self.charm, Config.TLS.TLS_PEER_RELATION)
self.certs = TLSCertificatesRequiresV1(self.charm, Config.TLS.TLS_PEER_RELATION)
self.framework.observe(
self.charm.on.set_tls_private_key_action, self._on_set_tls_private_key
)
Expand All @@ -69,7 +70,7 @@ def __init__(self, charm, peer_relation, substrate):
self.framework.observe(self.certs.on.certificate_expiring, self._on_certificate_expiring)

def is_tls_enabled(self, scope: Scopes):
"""Returns a boolean indicating if TLS for a given `scope` is enabled."""
"""Getting internal TLS flag (meaning)."""
return self.charm.get_secret(scope, Config.TLS.SECRET_CERT_LABEL) is not None

def _on_set_tls_private_key(self, event: ActionEvent) -> None:
Expand Down Expand Up @@ -182,17 +183,18 @@ def _on_certificate_available(self, event: CertificateAvailableEvent) -> None:
self.charm.set_secret(scope, Config.TLS.SECRET_CERT_LABEL, event.certificate)
self.charm.set_secret(scope, Config.TLS.SECRET_CA_LABEL, event.ca)

self.charm.unit.status = MaintenanceStatus("enabling TLS")
if self._waiting_for_certs():
logger.debug(
"Return till both internal and external TLS certificates available to avoid second restart."
"Defer till both internal and external TLS certificates available to avoid second restart."
)
event.defer()
return

logger.info("Restarting mongod with TLS enabled.")

self.charm.delete_tls_certificate_from_workload()
self.charm.push_tls_certificate_to_workload()
self.charm.unit.status = MaintenanceStatus("enabling TLS")
self.charm.restart_mongod_service()
self.charm.unit.status = ActiveStatus()

Expand Down
Loading
Loading