Merge ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:body-size into charm-k8s-mattermost:master

Proposed by Paul Collins
Status: Merged
Approved by: Junien F
Approved revision: 06bc2e95b4756a6e38df0b56bab1565d6ced09df
Merged at revision: b74d03312da2b934b147e7328725e40d0345d904
Proposed branch: ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:body-size
Merge into: charm-k8s-mattermost:master
Diff against target: 20 lines (+3/-1)
1 file modified
src/charm.py (+3/-1)
Reviewer Review Type Date Requested Status
Junien F Approve
Canonical IS Reviewers Pending
Review via email: mp+386052@code.launchpad.net

Commit message

update ingress to handle uploads up to max_file_size

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

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

Revision history for this message
Junien F (axino) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision b74d03312da2b934b147e7328725e40d0345d904

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/charm.py b/src/charm.py
index 1ebd6c9..31d1fd2 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -263,12 +263,14 @@ class MattermostK8sCharm(CharmBase):
263 return pod_spec263 return pod_spec
264264
265 parsed = urlparse(site_url)265 parsed = urlparse(site_url)
266 annotations = {}
267266
268 if not parsed.scheme.startswith('http'):267 if not parsed.scheme.startswith('http'):
269 return pod_spec268 return pod_spec
270269
271 pod_spec = copy.deepcopy(pod_spec)270 pod_spec = copy.deepcopy(pod_spec)
271 annotations = {
272 'nginx.ingress.kubernetes.io/proxy-body-size': '{}m'.format(config['max_file_size'])
273 }
272 ingress = {274 ingress = {
273 "name": self.app.name,275 "name": self.app.name,
274 "spec": {276 "spec": {

Subscribers

People subscribed via source and target branches