Merge pull request #45 from Marvin-Highcreek/main

enables dynamic hostnames
jouve · Apr 10, 2024 · 0ba2109 · 0ba2109
2 parents 3e6c2c6 + 1e07299
commit 0ba2109
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/charts/mailpit/Chart.yaml b/charts/mailpit/Chart.yaml
@@ -3,7 +3,7 @@ name: mailpit
 description: An email and SMTP testing tool with API for developers
 icon: https://raw.githubusercontent.com/axllent/mailpit/develop/server/ui/mailpit.svg
 type: application
-version: 0.15.2
+version: 0.15.3
 appVersion: 1.15.1
 dependencies:
 - name: common

diff --git a/charts/mailpit/ci/ingress-values.yaml b/charts/mailpit/ci/ingress-values.yaml
@@ -1,2 +1,6 @@
 ingress:
   enabled: true
+  hostname: '{{ .Release.Name }}.example.com'
+  annotations:
+    cert-manager.io/issuer: mailpit-issuer
+  tls: true
diff --git a/charts/mailpit/templates/ingress.yaml b/charts/mailpit/templates/ingress.yaml
@@ -14,7 +14,7 @@ spec:
   {{- end }}
   rules:
     {{- if .Values.ingress.hostname }}
-    - host: {{ .Values.ingress.hostname | quote }}
+    - host: {{ tpl .Values.ingress.hostname . | quote }}
       http:
         paths:
           - path: {{ .Values.ingress.path }}
@@ -37,7 +37,7 @@ spec:
   tls:
     {{- if and .Values.ingress.tls (include "common.ingress.certManagerRequest" ( dict "annotations" .Values.ingress.annotations )) }}
     - hosts:
-        - {{ .Values.ingress.hostname | quote }}
+        - {{ tpl .Values.ingress.hostname . | quote }}
       secretName: {{ template "common.names.fullname" . }}-tls
     {{- end }}
     {{- with .Values.ingress.extraTls }}