make hostname a top level parameter
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
{{- if .Values.ingress.enabled }}
|
||||
Application URL:
|
||||
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.ingress.host }}
|
||||
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ .Values.hostname }}
|
||||
{{- else if contains "NodePort" .Values.service.type }}
|
||||
Get the application URL by running these commands:
|
||||
export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "mailman3.fullname" . }})
|
||||
|
||||
@@ -39,6 +39,8 @@ spec:
|
||||
image: "{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ .Values.core.image.pullPolicy }}
|
||||
env:
|
||||
# - name: TZ
|
||||
# value: 'Europe/Berlin'
|
||||
- name: HYPERKITTY_API_KEY
|
||||
value: {{ .Values.hyperkittyApiKey }}
|
||||
- name: HYPERKITTY_URL
|
||||
|
||||
@@ -19,11 +19,11 @@ spec:
|
||||
{{- if .Values.ingress.tls }}
|
||||
tls:
|
||||
- hosts:
|
||||
- {{ .Values.ingress.host }}
|
||||
- {{ .Values.hostname }}
|
||||
secretName: {{ include "mailman3.fullname" . }}-certificate
|
||||
{{- end }}
|
||||
rules:
|
||||
- host: {{ .Values.ingress.host | quote }}
|
||||
- host: {{ .Values.hostname | quote }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
||||
@@ -49,7 +49,7 @@ spec:
|
||||
value: http://{{ include "mailman3.fullname" . }}-web.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:80
|
||||
{{- if .Values.ingress.enabled }}
|
||||
- name: SERVE_FROM_DOMAIN
|
||||
value: {{ .Values.ingress.host | quote }}
|
||||
value: {{ .Values.hostname | quote }}
|
||||
{{- end }}
|
||||
- name: DATABASE_URL
|
||||
value: sqlite://///opt/mailman-web-data/mailmanweb.db
|
||||
|
||||
Reference in New Issue
Block a user