Skip to content

Commit

Permalink
Merge pull request #14 from canonical/else-active-status
Browse files Browse the repository at this point in the history
Set ActiveStatus by default after version checking
  • Loading branch information
knkski authored Apr 26, 2021
2 parents 1e29c9f + f3211fd commit 2a91ff6
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,16 @@
from random import choices
from string import ascii_uppercase, digits

from oci_image import OCIImageResource, OCIImageResourceError
from ops.charm import CharmBase
from ops.framework import StoredState
from ops.main import main
from ops.model import ActiveStatus, MaintenanceStatus, WaitingStatus, BlockedStatus

from ops.model import ActiveStatus, BlockedStatus, MaintenanceStatus, WaitingStatus
from serialized_data_interface import (
get_interfaces,
NoVersionsListed,
NoCompatibleVersions,
NoVersionsListed,
get_interfaces,
)
from oci_image import OCIImageResource, OCIImageResourceError

log = logging.getLogger()


def gen_pass() -> str:
Expand All @@ -28,12 +25,15 @@ class Operator(CharmBase):

def __init__(self, *args):
super().__init__(*args)
self.log = logging.getLogger()

if not self.model.unit.is_leader():
log.info("Not a leader, skipping set_pod_spec")
self.log.info("Not a leader, skipping set_pod_spec")
self.model.unit.status = ActiveStatus()
return

self._stored.set_default(secret_key=gen_pass())

try:
self.interfaces = get_interfaces(self)
except NoVersionsListed as err:
Expand All @@ -42,6 +42,8 @@ def __init__(self, *args):
except NoCompatibleVersions as err:
self.model.unit.status = BlockedStatus(str(err))
return
else:
self.model.unit.status = ActiveStatus()

self.image = OCIImageResource(self, "oci-image")

Expand Down Expand Up @@ -77,7 +79,7 @@ def set_pod_spec(self, event):
image_details = self.image.fetch()
except OCIImageResourceError as e:
self.model.unit.status = e.status
log.info(e)
self.log.info(e)
return

secret_key = self.model.config["secret-key"] or self._stored.secret_key
Expand Down

0 comments on commit 2a91ff6

Please sign in to comment.