Merge ~arturo-seijas/charm-k8s-mattermost:expose-max-channels-per-team-setting into charm-k8s-mattermost:master

[Arturo Enrique Seijas Fernández]

Expose max channels per team setting (#1963643)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Tom Haddon (mthaddon)]

One comment inline.

Can we actually split this into two merge proposals?

One to add charmcraft.yaml and update the makefile so that `make test` still works as expected (note that it's relying on the presence of mattermost-k8s.charm which is no longer what will get created by charmcraft pack). And a second one with the config setting change and test update(s).

Thanks, Tom

review: Needs Fixing

[Arturo Enrique Seijas Fernández (arturo-seijas)]

> One comment inline.
>
> Can we actually split this into two merge proposals?
>
> One to add charmcraft.yaml and update the makefile so that `make test` still
> works as expected (note that it's relying on the presence of
> mattermost-k8s.charm which is no longer what will get created by charmcraft
> pack). And a second one with the config setting change and test update(s).
>
> Thanks, Tom

Done

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 1876a15d85ae219a1c221b7db471524c171500d9

diff --git a/config.yaml b/config.yaml
index fb5e1db..4cc4aea 100644
--- a/config.yaml
+++ b/config.yaml
@@ -53,6 +53,11 @@ options:
         description: |
           The password associated with mattermost_image_username for accessing the registry specified in mattermost_image_path.
         default: ''
+    max_channels_per_team:
+      type: int
+      description: |
+        Maximum number of channels per team, including both active and deleted channels.
+      default: 3000
     outbound_proxy:
         type: string
         description: The proxy to use for outbound requests.
diff --git a/src/charm.py b/src/charm.py
index 4ec1e8c..24393e7 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -221,6 +221,7 @@ class MattermostK8sCharm(CharmBase):
             'MM_LOGSETTINGS_CONSOLELEVEL': 'DEBUG' if config['debug'] else 'INFO',
             'MM_LOGSETTINGS_ENABLECONSOLE': 'true',
             'MM_LOGSETTINGS_ENABLEFILE': 'false',
+            'MM_TEAMSETTINGS_MAXCHANNELSPERTEAM': config['max_channels_per_team'],
         }
 
         if config['primary_team']:
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 641258d..8e1d3d1 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -106,6 +106,10 @@ CONFIG_LICENCE_REQUIRED_MIXED_INGRESS = {
     'sso': False,
 }
 
+CONFIG_CHANNELS = {
+    'max_channels_per_team': 20,
+}
+
 
 class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
     def setUp(self):
@@ -124,6 +128,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
     def test_make_pod_config(self):
         """Make pod config."""
         self.harness.charm.state.db_uri = 'postgresql://10.0.1.101:5432/'
+        self.harness.update_config(CONFIG_CHANNELS)
         expected = {
             'MATTERMOST_HTTPD_LISTEN_PORT': 8065,
             'MM_CONFIG': 'postgres://10.0.1.101:5432/',
@@ -134,6 +139,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             'MM_LOGSETTINGS_ENABLEFILE': 'false',
             'MM_SERVICESETTINGS_SITEURL': 'http://mattermost-k8s',
             'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/',
+            'MM_TEAMSETTINGS_MAXCHANNELSPERTEAM': 20,
         }
         self.assertEqual(self.harness.charm._make_pod_config(), expected)
         # Now test with `primary_team` set.