Merge ~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost:sidecar into charm-k8s-mattermost:master

[Tom Haddon]

7202600... by Tom Haddon on 2021-04-14

Add some comments explaining necessary follow up

6f00e95... by Tom Haddon on 2021-04-14

Add a comment about action bug

ca6af29... by Tom Haddon on 2021-04-14

Use is_running and log state for a bug report

e0e7062... by Tom Haddon on 2021-04-14

Remove spurious logging and add a reference to issue with charm upgrades losing state

cb7ab97... by Tom Haddon on 2021-04-15

Remove manifest.yaml which is now machine-generated

5f59fca... by Tom Haddon on 2021-04-23

Remove unused bases definition from metadata.yaml

Unmerged commits

5f59fca... by Tom Haddon on 2021-04-23

Remove unused bases definition from metadata.yaml

cb7ab97... by Tom Haddon on 2021-04-15

Remove manifest.yaml which is now machine-generated

e0e7062... by Tom Haddon on 2021-04-14

Remove spurious logging and add a reference to issue with charm upgrades losing state

ca6af29... by Tom Haddon on 2021-04-14

Use is_running and log state for a bug report

6f00e95... by Tom Haddon on 2021-04-14

Add a comment about action bug

7202600... by Tom Haddon on 2021-04-14

Add some comments explaining necessary follow up

0df48e9... by Tom Haddon on 2021-04-14

Convert to sidecar

diff --git a/README.md b/README.md
index 4a7ef53..1f61f15 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,13 @@ To deploy the charm and relate it to [the PostgreSQL K8s charm](https://charmhub
 Kubernetes model:
 
     juju deploy cs:~postgresql-charmers/postgresql-k8s postgresql
-    juju deploy cs:~mattermost-charmers/mattermost --config juju-external-hostname=foo.internal
+    # Can't publish to charmhub or the charmstore yet.
+    # juju deploy cs:~mattermost-charmers/mattermost --config juju-external-hostname=foo.internal
+    # Build locally
+    git checkout -b sidecar https://git.launchpad.net/~mthaddon/charm-k8s-mattermost/+git/charm-k8s-mattermost
+    cd charm-k8s-mattermost
+    charmcraft build
+    juju deploy ./mattermost.charm --resource mattermost-image=mattermostcharmers/mattermost:v5.33.3-20.04_edge
     juju relate mattermost postgresql:db
     juju expose mattermost
 
diff --git a/config.yaml b/config.yaml
index 5827200..68c34eb 100644
--- a/config.yaml
+++ b/config.yaml
@@ -34,25 +34,6 @@ options:
           Some features are not available without a licence.  For more
           information, consult the Mattermost documentation.
         default: ''
-    mattermost_image_path:
-        type: string
-        description: |
-          The location of the image to use, e.g. "registry.example.com/mattermost:v1".
-
-          Switching to a newer image version will initiate an upgrade of Mattermost.
-
-          This setting is required.
-        default: mattermostcharmers/mattermost:v5.33.3-20.04_edge
-    mattermost_image_username:
-        type: string
-        description: |
-          The username for accessing the registry specified in mattermost_image_path.
-        default: ''
-    mattermost_image_password:
-        type: string
-        description: |
-          The password associated with mattermost_image_username for accessing the registry specified in mattermost_image_path.
-        default: ''
     outbound_proxy:
         type: string
         description: The proxy to use for outbound requests.
@@ -183,10 +164,10 @@ options:
 
           This will not work unless the administrators of login.ubuntu.com have created a suitable SAML config first.
         default: false
-    use_canonical_defaults:
+    use_enterprise_defaults:
         type: boolean
         description: |
-          If set, apply miscellaneous Mattermost settings as used by Canonical.
+          If set, apply miscellaneous Mattermost settings as used in an Enterprise deployment.
         default: false
     use_experimental_saml_library:
         type: boolean
diff --git a/metadata.yaml b/metadata.yaml
index 75f7830..1dfabb2 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -7,9 +7,16 @@ description: |
   Mattermost is a flexible, open source messaging platform that enables
   secure team collaboration.
   https://mattermost.com
-min-juju-version: 2.8.0  # charm storage in state
-series:
-  - kubernetes
+
+containers:
+  mattermost:
+    resource: mattermost-image
+
+resources:
+  mattermost-image:
+    type: oci-image
+    description: Docker image for Mattermost to run
+
 requires:
   db:
     interface: pgsql
diff --git a/requirements.txt b/requirements.txt
index fd6adcd..873493e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-ops
+https://github.com/canonical/operator/archive/refs/heads/master.zip
 ops-lib-pgsql
diff --git a/src/charm.py b/src/charm.py
index 9416f62..14fa59c 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -31,6 +31,7 @@ from ops.model import (
 from utils import extend_list_merging_dicts_matched_by_key
 
 import logging
+import yaml
 
 
 pgsql = ops.lib.use("pgsql", 1, "[e-mail]")
@@ -45,7 +46,7 @@ METRICS_PORT = 8067
 DATABASE_NAME = 'mattermost'
 LICENCE_SECRET_KEY_NAME = 'licence'
 REQUIRED_S3_SETTINGS = ['s3_bucket', 's3_region', 's3_access_key_id', 's3_secret_access_key']
-REQUIRED_SETTINGS = ['mattermost_image_path']
+REQUIRED_SETTINGS = []
 REQUIRED_SSO_SETTINGS = ['licence', 'site_url']
 SAML_IDP_CRT = 'saml-idp.crt'
 
@@ -76,26 +77,6 @@ def check_ranges(ranges, name):
         return '{}: invalid network(s): {}'.format(name, ', '.join(invalid_networks))
 
 
-def get_container(pod_spec, container_name):
-    """Find and return the first container in pod_spec whose name is container_name, otherwise return None."""
-    for container in pod_spec['containers']:
-        if container['name'] == container_name:
-            return container
-    raise ValueError("Unable to find container named '{}' in pod spec".format(container_name))
-
-
-def get_env_config(pod_spec, container_name):
-    """Return the envConfig of the container in pod_spec whose name is container_name, otherwise return None.
-
-    If the container exists but has no envConfig, raise KeyError.
-    """
-    container = get_container(pod_spec, container_name)
-    if 'envConfig' in container:
-        return container['envConfig']
-    else:
-        raise ValueError("Unable to find envConfig for container named '{}'".format(container_name))
-
-
 class MattermostK8sCharm(CharmBase):
 
     state = StoredState()
@@ -104,21 +85,94 @@ class MattermostK8sCharm(CharmBase):
     def __init__(self, *args):
         super().__init__(*args)
 
-        self.framework.observe(self.on.start, self.configure_pod)
-        self.framework.observe(self.on.config_changed, self.configure_pod)
-        self.framework.observe(self.on.leader_elected, self.configure_pod)
-        self.framework.observe(self.on.upgrade_charm, self.configure_pod)
+        self.framework.observe(self.on.start, self._on_config_changed)
+        self.framework.observe(self.on.config_changed, self._on_config_changed)
+        self.framework.observe(self.on.leader_elected, self._on_config_changed)
+        self.framework.observe(self.on.upgrade_charm, self._on_upgrade_charm)
+
+        self.framework.observe(self.on.mattermost_pebble_ready, self._on_mattermost_pebble_ready)
 
         # actions
         self.framework.observe(self.on.grant_admin_role_action, self._on_grant_admin_role_action)
 
+        # state
+        self.state.set_default(db_conn_str=None, db_uri=None, db_ro_uris=[], mattermost_pebble_ready=False)
+
         # database
-        self.state.set_default(db_conn_str=None, db_uri=None, db_ro_uris=[])
         self.db = pgsql.PostgreSQLClient(self, 'db')
         self.framework.observe(self.db.on.database_relation_joined, self._on_database_relation_joined)
         self.framework.observe(self.db.on.master_changed, self._on_master_changed)
         self.framework.observe(self.db.on.standby_changed, self._on_standby_changed)
-        self.framework.observe(self.on.db_master_available, self.configure_pod)
+        self.framework.observe(self.on.db_master_available, self._on_config_changed)
+
+    def _get_pebble_config(self, event):
+        """Generate our pebble config."""
+        env_config = self._get_env_config()
+        pebble_config = {
+            "summary": "Mattermost layer",
+            "description": "Mattermost layer",
+            "services": {
+                "mattermost": {
+                    "override": "replace",
+                    "summary": "Mattermost service",
+                    "command": "/mattermost/bin/mattermost",
+                    "startup": "enabled",
+                    "environment": env_config,
+                }
+            },
+        }
+        return pebble_config
+
+    def _on_upgrade_charm(self, event):
+        """Handle the upgrade charm event."""
+        # XXX: State should persist across charm upgrades, but doesn't currently.
+        #      This means the relation data won't work as expected. See
+        #      https://github.com/canonical/operator/issues/506 for more details.
+        self.state.mattermost_pebble_ready = False
+        return
+
+    def _on_mattermost_pebble_ready(self, event):
+        """Handle the on pebble ready event."""
+        self.state.mattermost_pebble_ready = True
+        self._on_config_changed(event)
+
+    def _on_config_changed(self, event):
+        """Handle config-changed event."""
+        if not self.state.mattermost_pebble_ready:
+            logger.info(
+                "Got a config changed event, but the workload isn't ready yet. Doing nothing, config will be "
+                "picked up when workload is ready."
+            )
+            return
+
+        if not self.state.db_uri:
+            self.unit.status = WaitingStatus('Waiting for database relation')
+            event.defer()
+            return
+
+        problems = self._check_for_config_problems()
+        if problems:
+            self.unit.status = BlockedStatus(problems)
+            return
+
+        pebble_config = self._get_pebble_config(event)
+        if not pebble_config:
+            # Charm will be in blocked status.
+            return
+
+        container = self.unit.get_container("mattermost")
+
+        plan = container.get_plan()
+        if not plan or (plan.services != pebble_config["services"]):
+            logger.debug("About to add_layer with pebble_config:\n{}".format(yaml.dump(pebble_config)))
+            container.add_layer("mattermost", pebble_config, combine=True)
+
+            service = container.get_service("mattermost")
+            if service.is_running():
+                container.stop("mattermost")
+            container.start("mattermost")
+
+        self.unit.status = ActiveStatus()
 
     def _on_database_relation_joined(self, event: pgsql.DatabaseRelationJoinedEvent):
         """Handle db-relation-joined."""
@@ -185,6 +239,8 @@ class MattermostK8sCharm(CharmBase):
         pod_config = self._make_pod_config()
         pod_config.update(self._make_s3_pod_config())
 
+        # XXX: Readiness probe details below, needs to be implemented when
+        #      https://bugs.launchpad.net/juju/+bug/1922265 is addressed.
         return {
             'version': 3,  # otherwise resources are ignored
             'containers': [
@@ -200,12 +256,12 @@ class MattermostK8sCharm(CharmBase):
             ],
         }
 
-    def _make_pod_config(self):
+    def _make_env_config(self):
         """Return an envConfig with some core configuration."""
         config = self.model.config
         # https://github.com/mattermost/mattermost-server/pull/14666
         db_uri = self.state.db_uri.replace('postgresql://', 'postgres://')
-        pod_config = {
+        env_config = {
             'MATTERMOST_HTTPD_LISTEN_PORT': CONTAINER_PORT,
             'MM_CONFIG': db_uri,
             'MM_SQLSETTINGS_DATASOURCE': db_uri,
@@ -219,18 +275,18 @@ class MattermostK8sCharm(CharmBase):
         }
 
         if config['primary_team']:
-            pod_config['MM_TEAMSETTINGS_EXPERIMENTALPRIMARYTEAM'] = config['primary_team']
+            env_config['MM_TEAMSETTINGS_EXPERIMENTALPRIMARYTEAM'] = config['primary_team']
 
         if config['site_url']:
-            pod_config['MM_SERVICESETTINGS_SITEURL'] = config['site_url']
+            env_config['MM_SERVICESETTINGS_SITEURL'] = config['site_url']
 
         if config['outbound_proxy']:
-            pod_config['HTTP_PROXY'] = config['outbound_proxy']
-            pod_config['HTTPS_PROXY'] = config['outbound_proxy']
+            env_config['HTTP_PROXY'] = config['outbound_proxy']
+            env_config['HTTPS_PROXY'] = config['outbound_proxy']
             if config['outbound_proxy_exceptions']:
-                pod_config['NO_PROXY'] = config['outbound_proxy_exceptions']
+                env_config['NO_PROXY'] = config['outbound_proxy_exceptions']
 
-        return pod_config
+        return env_config
 
     def _missing_charm_settings(self):
         """Return a list of settings required to satisfy configuration dependencies, or else an empty list."""
@@ -241,9 +297,6 @@ class MattermostK8sCharm(CharmBase):
         if config['clustering'] and not config['licence']:
             missing.add('licence')
 
-        if config['mattermost_image_username'] and not config['mattermost_image_password']:
-            missing.add('mattermost_image_password')
-
         if config['performance_monitoring_enabled'] and not config['licence']:
             missing.add('licence')
 
@@ -258,24 +311,26 @@ class MattermostK8sCharm(CharmBase):
 
         return sorted(missing)
 
-    def _make_s3_pod_config(self):
+    def _update_env_config_for_s3(self, env_config):
         """Return an envConfig of S3 settings, if any."""
         config = self.model.config
         if not config['s3_enabled']:
-            return {}
+            return
 
-        return {
-            'MM_FILESETTINGS_DRIVERNAME': 'amazons3',
-            'MM_FILESETTINGS_MAXFILESIZE': str(config['max_file_size'] * 1048576),  # LP:1881227
-            'MM_FILESETTINGS_AMAZONS3SSL': 'true',  # defaults to true; belt and braces
-            'MM_FILESETTINGS_AMAZONS3ENDPOINT': config['s3_endpoint'],
-            'MM_FILESETTINGS_AMAZONS3BUCKET': config['s3_bucket'],
-            'MM_FILESETTINGS_AMAZONS3REGION': config['s3_region'],
-            'MM_FILESETTINGS_AMAZONS3ACCESSKEYID': config['s3_access_key_id'],
-            'MM_FILESETTINGS_AMAZONS3SECRETACCESSKEY': config['s3_secret_access_key'],
-            'MM_FILESETTINGS_AMAZONS3SSE': 'true' if config['s3_server_side_encryption'] else 'false',
-            'MM_FILESETTINGS_AMAZONS3TRACE': 'true' if config['debug'] else 'false',
-        }
+        env_config.update(
+            {
+                'MM_FILESETTINGS_DRIVERNAME': 'amazons3',
+                'MM_FILESETTINGS_MAXFILESIZE': str(config['max_file_size'] * 1048576),  # LP:1881227
+                'MM_FILESETTINGS_AMAZONS3SSL': 'true',  # defaults to true; belt and braces
+                'MM_FILESETTINGS_AMAZONS3ENDPOINT': config['s3_endpoint'],
+                'MM_FILESETTINGS_AMAZONS3BUCKET': config['s3_bucket'],
+                'MM_FILESETTINGS_AMAZONS3REGION': config['s3_region'],
+                'MM_FILESETTINGS_AMAZONS3ACCESSKEYID': config['s3_access_key_id'],
+                'MM_FILESETTINGS_AMAZONS3SECRETACCESSKEY': config['s3_secret_access_key'],
+                'MM_FILESETTINGS_AMAZONS3SSE': 'true' if config['s3_server_side_encryption'] else 'false',
+                'MM_FILESETTINGS_AMAZONS3TRACE': 'true' if config['debug'] else 'false',
+            }
+        )
 
     def _update_pod_spec_for_k8s_ingress(self, pod_spec):
         """Add resources to pod_spec configuring site ingress, if needed."""
@@ -288,6 +343,7 @@ class MattermostK8sCharm(CharmBase):
         if not parsed.scheme.startswith('http'):
             return
 
+        # XXX: This will need to be captured in the nginx-ingress-integrator relation.
         annotations = {'nginx.ingress.kubernetes.io/proxy-body-size': '{}m'.format(self.model.config['max_file_size'])}
         ingress = {
             "name": "{}-ingress".format(self.app.name),
@@ -304,6 +360,7 @@ class MattermostK8sCharm(CharmBase):
                 ]
             },
         }
+        # XXX This will need to be captured in the nginx-ingress-integrator relation.
         if parsed.scheme == 'https':
             ingress['spec']['tls'] = [{'hosts': [parsed.hostname]}]
             tls_secret_name = self.model.config['tls_secret_name']
@@ -363,37 +420,34 @@ class MattermostK8sCharm(CharmBase):
             }
         ]
 
-    def _update_pod_spec_for_licence(self, pod_spec):
+    def _update_env_config_for_licence(self, env_config):
         """Update pod_spec to make the licence, if configured, available to Mattermost."""
         config = self.model.config
         if not config['licence']:
             return
 
-        secrets = pod_spec['kubernetesResources'].get('secrets', [])
-        secrets = extend_list_merging_dicts_matched_by_key(secrets, self._make_licence_k8s_secrets(), key='name')
-        pod_spec['kubernetesResources']['secrets'] = secrets
+        # XXX: Per https://bugs.launchpad.net/juju/+bug/1854759 and
+        #      https://bugs.launchpad.net/juju/+bug/1878120 we don't currently
+        #      have a way of interacting with k8s secrets. Current guidance is
+        #      to use juju config directly for this, as we're doing here.
+        LICENCE_FILE = "/mattermost/licence.txt"
+        with open(LICENCE_FILE, 'w') as licence_file:
+            license_file.write(config['licence'])
 
-        container = get_container(pod_spec, self.app.name)
-        volume_config = container.get('volumeConfig', [])
-        volume_config = extend_list_merging_dicts_matched_by_key(
-            volume_config, self._make_licence_volume_configs(), key='name'
+        env_config.update(
+            {'MM_SERVICESETTINGS_LICENSEFILELOCATION': LICENCE_FILE},
         )
-        container['volumeConfig'] = volume_config
 
-        get_env_config(pod_spec, self.app.name).update(
-            {'MM_SERVICESETTINGS_LICENSEFILELOCATION': '/secrets/licence.txt'},
-        )
-
-    def _update_pod_spec_for_canonical_defaults(self, pod_spec):
-        """Update pod_spec with various Mattermost settings particular to Canonical's deployment.
+    def _update_env_config_for_enterprise_defaults(self, env_config):
+        """Update env_config with various Mattermost settings particular to an Enterprise deployment.
 
         These settings may be less generally useful, and so they are controlled here as a unit.
         """
         config = self.model.config
-        if not config['use_canonical_defaults']:
+        if not config['use_enterprise_defaults']:
             return
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {
                 # If this is off, users can't turn it on themselves.
                 'MM_SERVICESETTINGS_CLOSEUNUSEDDIRECTMESSAGES': 'true',
@@ -410,8 +464,8 @@ class MattermostK8sCharm(CharmBase):
             }
         )
 
-    def _update_pod_spec_for_clustering(self, pod_spec):
-        """Update pod_spec with clustering settings, varying the cluster name on the application name.
+    def _update_env_config_for_clustering(self, env_config):
+        """Update env_config with clustering settings, varying the cluster name on the application name.
 
         This is done so that blue/green deployments in the same model won't talk to each other.
         """
@@ -419,7 +473,7 @@ class MattermostK8sCharm(CharmBase):
         if not config['clustering']:
             return
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {
                 "MM_CLUSTERSETTINGS_ENABLE": "true",
                 "MM_CLUSTERSETTINGS_CLUSTERNAME": '{}-{}'.format(self.app.name, os.environ['JUJU_MODEL_UUID']),
@@ -427,8 +481,8 @@ class MattermostK8sCharm(CharmBase):
             }
         )
 
-    def _update_pod_spec_for_sso(self, pod_spec):
-        """Update pod_spec with settings to use login.ubuntu.com via SAML for single sign-on.
+    def _update_env_config_for_sso(self, env_config):
+        """Update env_config with settings to use login.ubuntu.com via SAML for single sign-on.
 
         SAML_IDP_CRT must be generated and installed manually by a human (see README.md).
         """
@@ -438,7 +492,7 @@ class MattermostK8sCharm(CharmBase):
         site_hostname = urlparse(config['site_url']).hostname
         use_experimental_saml_library = 'true' if config['use_experimental_saml_library'] else 'false'
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {
                 'MM_EMAILSETTINGS_ENABLESIGNINWITHEMAIL': 'false',
                 'MM_EMAILSETTINGS_ENABLESIGNINWITHUSERNAME': 'false',
@@ -463,23 +517,24 @@ class MattermostK8sCharm(CharmBase):
             }
         )
 
-    def _update_pod_spec_for_performance_monitoring(self, pod_spec):
+    def _update_env_config_for_performance_monitoring(self, env_config):
         """Update pod_spec with settings for the Prometheus exporter."""
         config = self.model.config
         if not config['performance_monitoring_enabled']:
             return
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {
                 'MM_METRICSSETTINGS_ENABLE': 'true' if config['performance_monitoring_enabled'] else 'false',
                 'MM_METRICSSETTINGS_LISTENADDRESS': ':{}'.format(METRICS_PORT),
             }
         )
 
+        # XXX: See LP:1923820.
         # Ordinarily pods are selected for scraping by the in-cluster
         # Prometheus based on their annotations.  Unfortunately Juju
-        # doesn't support pod annotations yet (LP:1884177).  When it
-        # does, here are the annotations we'll need to add:
+        # doesn't support pod annotations yet.
+        # Here are the annotations we'll need to add:
 
         # [ fetch or create annotations dict ]
         # annotations.update({
@@ -490,14 +545,14 @@ class MattermostK8sCharm(CharmBase):
         # })
         # [ store annotations in pod_spec ]
 
-    def _update_pod_spec_for_push(self, pod_spec):
+    def _update_env_config_for_push(self, env_config):
         """Update pod_spec with settings for Mattermost HPNS (hosted push notification service)."""
         config = self.model.config
         if not config['push_notification_server']:
             return
         contents = 'full' if config['push_notifications_include_message_snippet'] else 'id_loaded'
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {
                 'MM_EMAILSETTINGS_SENDPUSHNOTIFICATIONS': 'true',
                 'MM_EMAILSETTINGS_PUSHNOTIFICATIONCONTENTS': contents,
@@ -505,16 +560,29 @@ class MattermostK8sCharm(CharmBase):
             }
         )
 
-    def _update_pod_spec_for_smtp(self, pod_spec):
+    def _update_env_config_for_smtp(self, env_config):
         """Update pod_spec with settings for an outgoing SMTP relay."""
         config = self.model.config
         if not config['smtp_host']:
             return
 
-        get_env_config(pod_spec, self.app.name).update(
+        env_config.update(
             {'MM_EMAILSETTINGS_SMTPPORT': 25, 'MM_EMAILSETTINGS_SMTPSERVER': config['smtp_host']}
         )
 
+    def _get_env_config(self):
+        """Assemble our environment configuration."""
+        env_config = self._make_env_config()
+        self._update_env_config_for_s3(env_config)
+        self._update_env_config_for_enterprise_defaults(env_config)
+        self._update_env_config_for_clustering(env_config)
+        self._update_env_config_for_licence(env_config)
+        self._update_env_config_for_performance_monitoring(env_config)
+        self._update_env_config_for_push(env_config)
+        self._update_env_config_for_sso(env_config)
+        self._update_env_config_for_smtp(env_config)
+        return env_config
+
     def configure_pod(self, event):
         """Assemble the pod spec and apply it, if possible."""
         if not self.state.db_uri:
@@ -533,7 +601,7 @@ class MattermostK8sCharm(CharmBase):
 
         self.unit.status = MaintenanceStatus('Assembling pod spec')
         pod_spec = self._make_pod_spec()
-        self._update_pod_spec_for_canonical_defaults(pod_spec)
+        self._update_pod_spec_for_enterprise_defaults(pod_spec)
         self._update_pod_spec_for_clustering(pod_spec)
         self._update_pod_spec_for_k8s_ingress(pod_spec)
         self._update_pod_spec_for_licence(pod_spec)
@@ -548,6 +616,7 @@ class MattermostK8sCharm(CharmBase):
 
     def _on_grant_admin_role_action(self, event):
         """Handle the grant-admin-role action."""
+        # XXX: Currently fails due to https://bugs.launchpad.net/juju/+bug/1923822
         user = event.params["user"]
         cmd = ["/mattermost/bin/mattermost", "roles", "system_admin", user]
         granted = subprocess.run(cmd, capture_output=True)
@@ -562,4 +631,4 @@ class MattermostK8sCharm(CharmBase):
 
 
 if __name__ == '__main__':
-    main(MattermostK8sCharm, use_juju_for_storage=True)
+    main(MattermostK8sCharm)