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

[Barry Price]

Increase the hard-coded MM_TEAMSETTINGS_MAXUSERSPERTEAM value when use_canonical_defaults is set to True to address LP:2037746

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

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

[Barry Price (barryprice)]

n.b. Tests pass with the exception of the GFYCAT tests, likely unrelated.

See https://support.mattermost.com/hc/en-us/articles/18686008306708-Why-can-t-I-see-GIFs-in-the-GIF-picker-gfycat-service-shutdown-

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

FAILED: Continuous integration, rev:a1e8000afcef540469c634502dac7891a96de242
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/11/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/is/job/lp-charm-test/194/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/1512222/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/11//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

PASSED: Continuous integration, rev:cfe64fea5f16536a93c8986c5fa8a711520bfabe
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/195/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/1512241/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/12//rebuild

review: Approve (continuous-integration)

[Paul Collins (pjdc)]

Since there's a separate setting whose default meets the hard-coded value, I think we should just remove MM_TEAMSETTINGS_MAXUSERSPERTEAM from use_canonical_defaults entirely.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-is (prod-jenkaas-is)]

PASSED: Continuous integration, rev:2a778283fbac741c17b24d9d26ce792ed6d98009
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/196/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/1512830/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-mattermost-ci/13//rebuild

review: Approve (continuous-integration)

[Tom Haddon (mthaddon)]

LGTM, thx

review: Approve

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

Change successfully merged at revision 73cde5fc69555fc895e9277afc880677de233ef5

diff --git a/config.yaml b/config.yaml
index fcf1884..87aaec2 100644
--- a/config.yaml
+++ b/config.yaml
@@ -62,7 +62,7 @@ options:
       type: int
       description: |
         Maximum number of users per team, including active and inactive users.
-      default: 1000
+      default: 2000
     outbound_proxy:
         type: string
         description: The proxy to use for outbound requests.
diff --git a/src/charm.py b/src/charm.py
index d4e93f0..1b68768 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -415,10 +415,6 @@ class MattermostK8sCharm(CharmBase):
                 'MM_SERVICESETTINGS_ENABLELINKPREVIEWS': 'true',
                 # Matterhorn recommends the use of Personal Access Tokens.
                 'MM_SERVICESETTINGS_ENABLEUSERACCESSTOKENS': 'true',
-                # We'll use one large team.  Create and invite are
-                # disabled in the System Scheme, found in the Permissions
-                # section of the System Console.
-                'MM_TEAMSETTINGS_MAXUSERSPERTEAM': '1000',
             }
         )
 
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index b99de6e..6a6888e 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -257,7 +257,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             'MM_SERVICESETTINGS_SITEURL': 'http://mattermost-k8s',
             'MM_SQLSETTINGS_DATASOURCE': 'postgres://10.0.1.101:5432/',
             'MM_TEAMSETTINGS_MAXCHANNELSPERTEAM': 3000,
-            'MM_TEAMSETTINGS_MAXUSERSPERTEAM': 1000,
+            'MM_TEAMSETTINGS_MAXUSERSPERTEAM': 2000,
         }
         self.assertEqual(self.harness.charm._make_pod_config(), expected)
 
@@ -498,7 +498,6 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
                         'MM_SERVICESETTINGS_ENABLECUSTOMEMOJI': 'true',
                         'MM_SERVICESETTINGS_ENABLELINKPREVIEWS': 'true',
                         'MM_SERVICESETTINGS_ENABLEUSERACCESSTOKENS': 'true',
-                        'MM_TEAMSETTINGS_MAXUSERSPERTEAM': '1000',
                     },
                 }
             ],