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

[Tom Haddon]

Rename charm to mattermost-k8s for publishing directly on charmhub

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

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

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

Change successfully merged at revision f6916af8983cd3b2c532566b0acbd7eef37874b5

diff --git a/Makefile b/Makefile
index b241423..1bf76cc 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ lint: blacken
 
 # We actually use the build directory created by charmcraft,
 # but the .charm file makes a much more convenient sentinel.
-unittest: mattermost.charm
+unittest: mattermost-k8s.charm
 	@tox -e unit
 
 test: lint unittest
@@ -17,7 +17,7 @@ clean:
 	@echo "Cleaning files"
 	@git clean -fXd
 
-mattermost.charm: src/*.py requirements.txt
+mattermost-k8s.charm: src/*.py requirements.txt
 	charmcraft build
 
 .PHONY: lint test unittest clean
diff --git a/README.md b/README.md
index 4a7ef53..2d74794 100644
--- a/README.md
+++ b/README.md
@@ -20,12 +20,12 @@ details on using Juju with MicroK8s for easy local testing [see here](https://ju
 To deploy the charm and relate it to [the PostgreSQL K8s charm](https://charmhub.io/postgresql-k8s) within a Juju
 Kubernetes model:
 
-    juju deploy cs:~postgresql-charmers/postgresql-k8s postgresql
-    juju deploy cs:~mattermost-charmers/mattermost --config juju-external-hostname=foo.internal
-    juju relate mattermost postgresql:db
-    juju expose mattermost
+    juju deploy postgresql-k8s
+    juju deploy mattermost-k8s --config juju-external-hostname=foo.internal
+    juju relate mattermost-k8s postgresql-k8s:db
+    juju expose mattermost-k8s
 
-Once the deployment has completed and the "mattermost" workload state in `juju
+Once the deployment has completed and the "mattermost-k8s" workload state in `juju
 status` has changed to "active" you can visit http://${mattermost_ip}:8065 in a browser and log in to
 your Mattermost instance, and you'll be presented with a screen to create an
 initial admin account. Further accounts must be created using this admin account, or by
diff --git a/metadata.yaml b/metadata.yaml
index 75f7830..f19cb73 100644
--- a/metadata.yaml
+++ b/metadata.yaml
@@ -1,4 +1,5 @@
-name: mattermost
+name: mattermost-k8s
+display-name: Mattermost
 summary: Mattermost is a flexible, open source messaging platform that enables secure team collaboration.
 docs: https://discourse.charmhub.io/t/mattermost-documentation-overview/3758
 maintainers:
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
index 44bee1f..6fb16c7 100644
--- a/tests/unit/test_charm.py
+++ b/tests/unit/test_charm.py
@@ -214,7 +214,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         expected = {
             'containers': [
                 {
-                    'name': 'mattermost',
+                    'name': 'mattermost-k8s',
                     'envConfig': {
                         'MM_EMAILSETTINGS_SENDPUSHNOTIFICATIONS': 'true',
                         'MM_EMAILSETTINGS_PUSHNOTIFICATIONCONTENTS': 'id_loaded',
@@ -224,7 +224,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             ],
         }
         pod_spec = {
-            'containers': [{'name': 'mattermost', 'envConfig': {}}],
+            'containers': [{'name': 'mattermost-k8s', 'envConfig': {}}],
         }
         self.harness.charm._update_pod_spec_for_push(pod_spec)
         self.assertEqual(pod_spec, expected)
@@ -235,7 +235,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         expected = {
             'containers': [
                 {
-                    'name': 'mattermost',
+                    'name': 'mattermost-k8s',
                     'envConfig': {
                         'MM_EMAILSETTINGS_SENDPUSHNOTIFICATIONS': 'true',
                         'MM_EMAILSETTINGS_PUSHNOTIFICATIONCONTENTS': 'full',
@@ -245,7 +245,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
             ],
         }
         pod_spec = {
-            'containers': [{'name': 'mattermost', 'envConfig': {}}],
+            'containers': [{'name': 'mattermost-k8s', 'envConfig': {}}],
         }
         self.harness.charm._update_pod_spec_for_push(pod_spec)
         self.assertEqual(pod_spec, expected)
@@ -253,7 +253,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
     def test_get_licence_secret_name(self):
         """Test the licence secret name is correctly constructed"""
         self.harness.update_config(CONFIG_LICENCE_SECRET)
-        self.assertEqual(self.harness.charm._get_licence_secret_name(), "mattermost-licence-b5bbb1bf")
+        self.assertEqual(self.harness.charm._get_licence_secret_name(), "mattermost-k8s-licence-b5bbb1bf")
 
     def test_make_licence_k8s_secrets(self):
         """Test making licence k8s secrets"""
@@ -261,7 +261,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         self.assertEqual(self.harness.charm._make_licence_k8s_secrets(), [])
         self.harness.update_config(CONFIG_LICENCE_SECRET)
         expected = [
-            {'name': 'mattermost-licence-b5bbb1bf', 'type': 'Opaque', 'stringData': {'licence': 'RANDOMSTRING'}}
+            {'name': 'mattermost-k8s-licence-b5bbb1bf', 'type': 'Opaque', 'stringData': {'licence': 'RANDOMSTRING'}}
         ]
         self.assertEqual(self.harness.charm._make_licence_k8s_secrets(), expected)
 
@@ -275,7 +275,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
                 'name': 'licence',
                 'mountPath': '/secrets',
                 'secret': {
-                    'name': 'mattermost-licence-b5bbb1bf',
+                    'name': 'mattermost-k8s-licence-b5bbb1bf',
                     'files': [{'key': 'licence', 'path': 'licence.txt', 'mode': 0o444}],
                 },
             }
@@ -295,7 +295,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
                 'tls_secret_name': 'chat-example-com-tls',
             }
         )
-        ingress_name = 'mattermost-ingress'
+        ingress_name = 'mattermost-k8s-ingress'
         self.assertNotEqual(ingress_name, self.harness.charm.app.name)
         expected = {
             'kubernetesResources': {
@@ -310,7 +310,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
                                         'paths': [
                                             {
                                                 'path': '/',
-                                                'backend': {'serviceName': 'mattermost', 'servicePort': 8065},
+                                                'backend': {'serviceName': 'mattermost-k8s', 'servicePort': 8065},
                                             }
                                         ]
                                     },
@@ -344,7 +344,7 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
                                         'paths': [
                                             {
                                                 'path': '/',
-                                                'backend': {'serviceName': 'mattermost', 'servicePort': 8065},
+                                                'backend': {'serviceName': 'mattermost-k8s', 'servicePort': 8065},
                                             }
                                         ]
                                     },
@@ -370,12 +370,12 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         # When we can, this test will need updating.
         self.harness.update_config({'performance_monitoring_enabled': True})
         pod_spec = {
-            'containers': [{'name': 'mattermost', 'envConfig': {}}],
+            'containers': [{'name': 'mattermost-k8s', 'envConfig': {}}],
         }
         expected = {
             'containers': [
                 {
-                    'name': 'mattermost',
+                    'name': 'mattermost-k8s',
                     'envConfig': {
                         'MM_METRICSSETTINGS_ENABLE': 'true',
                         'MM_METRICSSETTINGS_LISTENADDRESS': ':{}'.format(METRICS_PORT),
@@ -395,15 +395,15 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         self.assertEqual(pod_spec, {})
         self.harness.update_config({'clustering': True})
         pod_spec = {
-            'containers': [{'name': 'mattermost', 'envConfig': {}}],
+            'containers': [{'name': 'mattermost-k8s', 'envConfig': {}}],
         }
         expected = {
             'containers': [
                 {
-                    'name': 'mattermost',
+                    'name': 'mattermost-k8s',
                     'envConfig': {
                         'MM_CLUSTERSETTINGS_ENABLE': 'true',
-                        'MM_CLUSTERSETTINGS_CLUSTERNAME': 'mattermost-fakeuuid',
+                        'MM_CLUSTERSETTINGS_CLUSTERNAME': 'mattermost-k8s-fakeuuid',
                         'MM_CLUSTERSETTINGS_USEIPADDRESS': 'true',
                     },
                 }
@@ -420,12 +420,12 @@ class TestMattermostK8sCharmHooksDisabled(unittest.TestCase):
         self.assertEqual(pod_spec, {})
         self.harness.update_config({'use_canonical_defaults': True})
         pod_spec = {
-            'containers': [{'name': 'mattermost', 'envConfig': {}}],
+            'containers': [{'name': 'mattermost-k8s', 'envConfig': {}}],
         }
         expected = {
             'containers': [
                 {
-                    'name': 'mattermost',
+                    'name': 'mattermost-k8s',
                     'envConfig': {
                         'MM_SERVICESETTINGS_CLOSEUNUSEDDIRECTMESSAGES': 'true',
                         'MM_SERVICESETTINGS_ENABLECUSTOMEMOJI': 'true',