Merge ~ballot/charm-k8s-mm-pd-bot/+git/charm-k8s-mm-pd-bot:rework_ssl into charm-k8s-mm-pd-bot:master

[Benjamin Allot]

Rework SSL. When tls_secret_name is set, terminate SSL on the ingress

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

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

[Junien F (axino)]

+1

review: Approve

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

Change successfully merged at revision cff66fee7a770e12ba2419d5c8e4c97f7acf4f4a

diff --git a/src/charm.py b/src/charm.py
index 8161913..4de6b21 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -171,9 +171,9 @@ class MmPdBotK8sCharm(CharmBase):
         hostname = self.bot_config.get('httpd', 'hostname')
         container_port = self.bot_config.getint('httpd', 'listen-port')
         magic_uuid = self.bot_config.get('httpd', 'magic-uuid')
-        ssl = self.bot_config.getboolean('httpd', 'ssl', fallback=False)
+        tls_secret_name = self.model.config.get('tls_secret_name', None)
 
-        if ssl:
+        if tls_secret_name:
             scheme = "https"
         else:
             scheme = "http"
@@ -200,11 +200,10 @@ class MmPdBotK8sCharm(CharmBase):
                 ]
             },
         }
-        if ssl:
-            ingress['spec']['tls'] = [{'hosts': [bot_listening_url_parsed.hostname]}]
-            tls_secret_name = self.model.config.get('tls_secret_name', None)
-            if tls_secret_name:
-                ingress['spec']['tls'][0]['secretName'] = tls_secret_name
+        if tls_secret_name:
+            ingress['spec']['tls'] = [
+                {'hosts': [bot_listening_url_parsed.hostname], 'secretName': tls_secret_name,},
+            ]
         else:
             annotations['nginx.ingress.kubernetes.io/ssl-redirect'] = 'false'