fix(authelia): traefikcrd only include certresolver if specified (#96)

authelia · Aug 12, 2021 · 2ed2f97 · 2ed2f97
1 parent 7ee290d
commit 2ed2f97
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git 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: [email protected]
     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
@@ -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 -}}
+  {{- end -}}
diff --git 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
@@ -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: