From 2ed2f97982b67a1ca3b8d07717cb3ee83583a6af Mon Sep 17 00:00:00 2001
From: James Elliott <james-d-elliott@users.noreply.github.com>
Date: Thu, 12 Aug 2021 13:34:44 +1000
Subject: [PATCH] fix(authelia): traefikcrd only include certresolver if
 specified (#96)

---
 charts/authelia/Chart.yaml                     |  4 ++--
 .../templates/traefikCRD/ingressRoute.yaml     | 18 +++++++++---------
 charts/authelia/values.local.yaml              |  2 +-
 charts/authelia/values.yaml                    |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/charts/authelia/Chart.yaml b/charts/authelia/Chart.yaml
index c488749..9b5176e 100644
--- a/charts/authelia/Chart.yaml
+++ b/charts/authelia/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: authelia
-version: 0.5.5
+version: 0.5.6
 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.3
+appVersion: 4.30.4
 deprecated: false
 annotations: {}
diff --git a/charts/authelia/templates/traefikCRD/ingressRoute.yaml b/charts/authelia/templates/traefikCRD/ingressRoute.yaml
index 21d7ce6..92b69ab 100644
--- a/charts/authelia/templates/traefikCRD/ingressRoute.yaml
+++ b/charts/authelia/templates/traefikCRD/ingressRoute.yaml
@@ -40,7 +40,14 @@ spec:
   {{- end }}
   {{- if .Values.ingress.tls.enabled }}
   tls:
-    {{- if not .Values.ingress.traefikCRD.tls.certResolver }}
+    {{- if hasKey .Values.ingress.traefikCRD.tls "certResolver" }}
+    certResolver: {{ default "default" .Values.ingress.traefikCRD.tls.certResolver }}
+    domains:
+      - main: {{ default (include "authelia.ingressHost" .) .Values.ingress.tls.hostNameOverride }}
+        {{- if .Values.ingress.traefikCRD.tls.sans }}
+        sans: {{- toYaml .Values.ingress.traefikCRD.tls.sans | nindent 10 }}
+        {{- end }}
+    {{- else }}
     secretName: {{ default (printf "%s-traefik-tls" (include "authelia.name" .)) .Values.ingress.tls.secret }}
     {{- end }}
     options:
@@ -50,12 +57,5 @@ spec:
       name: {{ default (include "authelia.name" .) .Values.ingress.traefikCRD.tls.options.nameOverride }}
       namespace: {{ .Release.Namespace }}
     {{- end }}
-    certResolver: {{ default "default" .Values.ingress.traefikCRD.tls.certResolver }}
-    domains:
-      - main: {{ default (include "authelia.ingressHost" .) .Values.ingress.tls.hostNameOverride }}
-        {{- if .Values.ingress.traefikCRD.tls.sans }}
-        sans: {{- toYaml .Values.ingress.traefikCRD.tls.sans | nindent 10 }}
-  {{- end }}
-  {{- else }}
   {{- end }}
-  {{- end -}}
\ No newline at end of file
+  {{- end -}}
diff --git a/charts/authelia/values.local.yaml b/charts/authelia/values.local.yaml
index 1628d07..d7c6c4f 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.3
+  tag: 4.30.4
   pullPolicy: IfNotPresent
   pullSecrets: []
   # pullSecrets:
diff --git a/charts/authelia/values.yaml b/charts/authelia/values.yaml
index 851ff22..6566cfa 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.3
+  tag: 4.30.4
   pullPolicy: IfNotPresent
   pullSecrets: []
   # pullSecrets: