Merge ~moon127/charm-k8s-discourse/+git/charm-k8s-discourse:lib-resource-fixes into charm-k8s-discourse:master

[Gareth Woolridge]

Fix config.yaml to match smtp_username as used in charm.py

Set ImagePullPolicy: Never, for microk8s testing, otherwise we get ErrImagePull, as we don't have a registry

[🤖 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)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

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

Change successfully merged at revision 93261e51462fa279142898cb4270c61a42458428

diff --git a/config.yaml b/config.yaml
index 4d1c4bd..6d656db 100644
--- a/config.yaml
+++ b/config.yaml
@@ -47,7 +47,7 @@ options:
     type: int
     description: "Port to use when connecting to SMTP server"
     default: 587
-  smtp_user_name:
+  smtp_username:
     type: string
     description: "Username to use when sending mail via SMTP"
     default: ""
diff --git a/src/charm.py b/src/charm.py
index 117b304..86f8ab6 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -53,6 +53,7 @@ class DiscourseCharm(CharmBase):
             'containers': [{
                 'name': self.framework.model.app.name,
                 'imageDetails': discourse_image_details,
+                'imagePullPolicy': 'Never',
                 'ports': [{
                     'containerPort': int(config['service_port']),
                     'protocol': 'TCP',