[stable/mailhog] Allow multiple ingress hosts and update Chart.yaml (#1590)

* [stable/mailhog] Allow multiple ingress hosts and update Chart.yaml

* Update ingress template
This commit is contained in:
Reinhard Nägele
2017-08-13 19:17:26 +02:00
committed by GitHub
parent 899dae1e54
commit 0f7e04bc02
3 changed files with 17 additions and 11 deletions
+3 -2
View File
@@ -1,7 +1,8 @@
apiVersion: v1
description: An e-mail testing tool for developers
name: mailhog
version: 1.1.0
appVersion: 1.0.0
version: 1.2.0
keywords:
- mailhog
- mail
@@ -14,5 +15,5 @@ icon: https://raw.githubusercontent.com/mailhog/MailHog-UI/master/assets/images/
sources:
- https://github.com/mailhog/MailHog
maintainers:
- name: Reinhard Nägele
- name: unguiculus
email: unguiculus@gmail.com
+12 -8
View File
@@ -1,4 +1,6 @@
{{- if .Values.ingress.enabled }}
{{- $fullName := include "fullname" . -}}
{{- $path := .Values.ingress.path -}}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
@@ -11,22 +13,24 @@ metadata:
chart: {{ .Chart.Name }}-{{ .Chart.Version }}
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
name: {{ template "fullname" . }}
name: {{ $fullName }}
spec:
{{- if .Values.ingress.tls.enabled }}
tls:
- hosts:
- {{ .Values.ingress.host }}
{{- range .Values.ingress.hosts }}
- {{ . }}
{{- end }}
secretName: {{ template "tlsSecret" . }}
{{- end }}
rules:
- http:
{{- range .Values.ingress.hosts }}
- host: {{ . }}
http:
paths:
- path: {{ .Values.ingress.path }}
- path: {{ $path }}
backend:
serviceName: {{ template "fullname" . }}
serviceName: {{ $fullName }}
servicePort: http
{{- if .Values.ingress.host }}
host: {{ .Values.ingress.host }}
{{- end }}
{{- end }}
{{- end }}
+2 -1
View File
@@ -19,7 +19,8 @@ ingress:
enabled: false
annotations: {}
path: /
host: mailhog.example.com
hosts:
- mailhog.example.com
tls:
enabled: false
existingSecret: false