From 4838e8291a8e0b6b3089dbbe7a69c75b9807d227 Mon Sep 17 00:00:00 2001
From: James Elliott <james-d-elliott@users.noreply.github.com>
Date: Tue, 10 Aug 2021 15:11:42 +1000
Subject: [PATCH] feat(authelia): 4.30.3 (#94)

---
 charts/authelia/Chart.yaml               |  4 ++--
 charts/authelia/templates/configMap.yaml | 19 ++++++++++++++-----
 charts/authelia/values.local.yaml        |  5 +++--
 charts/authelia/values.yaml              |  5 +++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/charts/authelia/Chart.yaml b/charts/authelia/Chart.yaml
index 3633fea..9ed790b 100644
--- a/charts/authelia/Chart.yaml
+++ b/charts/authelia/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: authelia
-version: 0.5.3
+version: 0.5.4
 kubeVersion: ">= 1.13.0-0"
 description: Authelia is a Single Sign-On Multi-Factor portal for web apps
 type: application
@@ -23,6 +23,6 @@ maintainers:
     email: james-d-elliott@users.noreply.github.com
     url: https://github.com/james-d-elliott
 icon: https://avatars2.githubusercontent.com/u/59122411?s=200&v=4
-appVersion: 4.30.2
+appVersion: 4.30.3
 deprecated: false
 annotations: {}
diff --git a/charts/authelia/templates/configMap.yaml b/charts/authelia/templates/configMap.yaml
index 5f06679..3bc064d 100644
--- a/charts/authelia/templates/configMap.yaml
+++ b/charts/authelia/templates/configMap.yaml
@@ -56,7 +56,12 @@ data:
         url: {{ $auth.ldap.url }}
         timeout: {{ default "5s" $auth.ldap.timeout }}
         start_tls: {{ $auth.ldap.start_tls }}
-        tls: {{ toYaml $auth.ldap.tls | nindent 10 }}
+        tls:
+          {{- if hasKey $auth.ldap.tls "server_name" }}
+          server_name: {{ default $auth.ldap.host $auth.ldap.tls.server_name }}
+          {{- end }}
+          minimum_version: {{ default "TLS1.2" $auth.ldap.tls.minimum_version }}
+          skip_verify: {{ default false $auth.ldap.tls.skip_verify }}
     {{- if $auth.ldap.base_dn }}
         base_dn: {{ $auth.ldap.base_dn }}
     {{- end }}
@@ -107,8 +112,8 @@ data:
     {{- if $session.redis.tls.enabled }}
         tls:
           server_name: {{ $session.redis.tls.server_name }}
-          skip_verify: {{ $session.redis.tls.skip_verify }}
           minimum_version: {{ default "TLS1.2" $session.redis.tls.minimum_version }}
+          skip_verify: {{ $session.redis.tls.skip_verify }}
     {{- end }}
     {{- if $session.redis.high_availability.enabled }}
         high_availability:
@@ -154,17 +159,21 @@ data:
         filename: {{ $notifier.filesystem.filename }}
     {{- end }}
     {{- if $notifier.smtp.enabled }}
-      smtp:
-        username: {{ $notifier.smtp.username }}
+      h
         host: {{ $notifier.smtp.host }}
         port: {{ default 25 $notifier.smtp.port }}
+        timeout: {{ default "5s" $notifier.smtp.timeout }}
+        username: {{ $notifier.smtp.username }}
         sender: {{ $notifier.smtp.sender }}
         identifier: {{ $notifier.smtp.identifier }}
         subject: {{ $notifier.smtp.subject | quote }}
         startup_check_address: {{ $notifier.smtp.startup_check_address }}
         disable_require_tls: {{ $notifier.smtp.disable_require_tls }}
         disable_html_emails: {{ $notifier.smtp.disable_html_emails }}
-        tls: {{ toYaml $notifier.smtp.tls | nindent 10 }}
+        tls:
+          server_name: {{ default $notifier.smtp.host $notifier.smtp.tls.server_name }}
+          minimum_version: {{ default "TLS1.2" $notifier.smtp.tls.minimum_version }}
+          skip_verify: {{ default false $notifier.smtp.tls.skip_verify }}
     {{- end }}
     {{- end }}
     {{- if .Values.configMap.identity_providers.oidc.enabled }}
diff --git a/charts/authelia/values.local.yaml b/charts/authelia/values.local.yaml
index ad01917..1628d07 100644
--- a/charts/authelia/values.local.yaml
+++ b/charts/authelia/values.local.yaml
@@ -19,7 +19,7 @@ image:
   # registry: docker.io
   registry: ghcr.io
   repository: authelia/authelia
-  tag: 4.30.2
+  tag: 4.30.3
   pullPolicy: IfNotPresent
   pullSecrets: []
   # pullSecrets:
@@ -882,9 +882,10 @@ configMap:
     smtp:
       enabled: false
       enabledSecret: false
-      username: test
       host: smtp.mail.svc.cluster.local
       port: 25
+      timeout: 5s
+      username: test
       sender: admin@example.com
       ## HELO/EHLO Identifier. Some SMTP Servers may reject the default of localhost.
       identifier: localhost
diff --git a/charts/authelia/values.yaml b/charts/authelia/values.yaml
index b66d28b..851ff22 100644
--- a/charts/authelia/values.yaml
+++ b/charts/authelia/values.yaml
@@ -18,7 +18,7 @@ image:
   # registry: docker.io
   registry: ghcr.io
   repository: authelia/authelia
-  tag: 4.30.2
+  tag: 4.30.3
   pullPolicy: IfNotPresent
   pullSecrets: []
   # pullSecrets:
@@ -880,9 +880,10 @@ configMap:
     smtp:
       enabled: true
       enabledSecret: false
-      username: test
       host: smtp.mail.svc.cluster.local
       port: 25
+      timeout: 5s
+      username: test
       sender: admin@example.com
       ## HELO/EHLO Identifier. Some SMTP Servers may reject the default of localhost.
       identifier: localhost