fix ingresses tls (#57)

DefGuard · Jul 25, 2024 · 26ed2f2 · 26ed2f2
1 parent 045b8c5
commit 26ed2f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/charts/defguard/templates/ingress-grpc.yaml b/charts/defguard/templates/ingress-grpc.yaml
@@ -27,11 +27,9 @@ spec:
   {{- end }}
   {{- if .Values.ingress.grpc.tls }}
   tls:
-    {{- range .Values.ingress.grpc.tls }}
     - hosts:
       - {{ .Values.ingress.grpc.host | quote }}
-      secretName: {{ .secretName }}
-    {{- end }}
+      secretName: {{ printf "%s-grpc-tls" .Values.ingress.grpc.host }}
   {{- end }}
   rules:
     - host: {{ .Values.ingress.grpc.host | quote }}

diff --git a/charts/defguard/templates/ingress-web.yaml b/charts/defguard/templates/ingress-web.yaml
@@ -27,11 +27,9 @@ spec:
   {{- end }}
   {{- if .Values.ingress.web.tls }}
   tls:
-    {{- range .Values.ingress.web.tls }}
     - hosts:
       - {{ .Values.ingress.web.host | quote }}
-      secretName: {{ .secretName }}
-    {{- end }}
+      secretName: {{ printf "%s-web-tls" .Values.ingress.web.host }}
   {{- end }}
   rules:
     - host: {{ .Values.ingress.web.host | quote }}

diff --git a/charts/defguard/values.yaml b/charts/defguard/values.yaml
@@ -18,13 +18,13 @@ ingress:
     className: ""
     enabled: true
     host: defguard-grpc.local
-    tls: []
+    tls: false
   web:
     annotations: {}
     className: ""
     enabled: true
     host: defguard.local
-    tls: []
+    tls: false
 existingJwtSecret: ""
 ldap:
   admin_group: ""