Merge ~pjdc/charm-k8s-mattermost/+git/charm-k8s-mattermost:outbound-proxy into charm-k8s-mattermost:master

[Paul Collins]

add outbound_proxy and outbound_proxy_exceptions settings

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

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

[Paul Collins (pjdc)]

Implemented per https://docs.mattermost.com/install/outbound-proxy.html

[Tom Haddon (mthaddon)]

LGTM

review: Approve

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

Change successfully merged at revision b314a7bc7c3f906bab2a572f322be9bfb95f389b

diff --git a/config.yaml b/config.yaml
index 985f777..5a55055 100644
--- a/config.yaml
+++ b/config.yaml
@@ -7,6 +7,27 @@ options:
         type: boolean
         description: Allows users to sign up from the root page without an invite
         default: false
+    outbound_proxy:
+        type: string
+        description: The proxy to use for outbound requests.
+        default: ''
+    outbound_proxy_exceptions:
+        type: string
+        description: |
+          A list of destinations for which the outbound proxy will not
+          be used.
+
+          This can be configured as a set of comma-separated IP
+          addresses (e.g. "1.2.3.4"), IP address ranges specified in
+          CIDR notation (e.g. "1.2.3.4/8"), or domain names.  An IP
+          address or domain name can also include a port number.
+
+          When a domain name is specified, the domain and all of its
+          subdomains are matched.  However, a domain name with a
+          leading "." only matches the subdomains.  For example,
+          "example.com" matches both "example.com" and "sub.example.com"
+          while ".example.com" only matches the latter.
+        default: ''
     site_url:
         type: string
         description: |
diff --git a/src/charm.py b/src/charm.py
index 05e97e9..077c8fc 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -135,6 +135,12 @@ class MattermostK8sCharm(CharmBase):
         if config['site_url']:
             pod_config['MM_SERVICESETTINGS_SITEURL'] = config['site_url']
 
+        if config['outbound_proxy']:
+            pod_config['HTTP_PROXY'] = config['outbound_proxy']
+            pod_config['HTTPS_PROXY'] = config['outbound_proxy']
+            if config['outbound_proxy_exceptions']:
+                pod_config['NO_PROXY'] = config['outbound_proxy_exceptions']
+
         return pod_config
 
     def _make_k8s_resources(self):