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

Proposed by Gareth Woolridge
Status: Merged
Approved by: Jay Kuri
Approved revision: b7c9bdd0bb41d312068c8429c714f63f472c172b
Merged at revision: 93261e51462fa279142898cb4270c61a42458428
Proposed branch: ~moon127/charm-k8s-discourse/+git/charm-k8s-discourse:lib-resource-fixes
Merge into: charm-k8s-discourse:master
Diff against target: 25 lines (+2/-1)
2 files modified
config.yaml (+1/-1)
src/charm.py (+1/-0)
Reviewer Review Type Date Requested Status
Canonical IS Reviewers Pending
Discourse Charm Maintainers Pending
Review via email: mp+383148@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

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

Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision 93261e51462fa279142898cb4270c61a42458428

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 4d1c4bd..6d656db 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -47,7 +47,7 @@ options:
6 type: int
7 description: "Port to use when connecting to SMTP server"
8 default: 587
9- smtp_user_name:
10+ smtp_username:
11 type: string
12 description: "Username to use when sending mail via SMTP"
13 default: ""
14diff --git a/src/charm.py b/src/charm.py
15index 117b304..86f8ab6 100755
16--- a/src/charm.py
17+++ b/src/charm.py
18@@ -53,6 +53,7 @@ class DiscourseCharm(CharmBase):
19 'containers': [{
20 'name': self.framework.model.app.name,
21 'imageDetails': discourse_image_details,
22+ 'imagePullPolicy': 'Never',
23 'ports': [{
24 'containerPort': int(config['service_port']),
25 'protocol': 'TCP',

Subscribers

People subscribed via source and target branches