make hostname a top level parameter
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{{- if .Values.ingress.enabled }}
|
{{- if .Values.ingress.enabled }}
|
||||||
Application URL:
|
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 }}
|
{{- else if contains "NodePort" .Values.service.type }}
|
||||||
Get the application URL by running these commands:
|
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" . }})
|
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 }}"
|
image: "{{ .Values.core.image.repository }}:{{ .Values.core.image.tag | default .Chart.AppVersion }}"
|
||||||
imagePullPolicy: {{ .Values.core.image.pullPolicy }}
|
imagePullPolicy: {{ .Values.core.image.pullPolicy }}
|
||||||
env:
|
env:
|
||||||
|
# - name: TZ
|
||||||
|
# value: 'Europe/Berlin'
|
||||||
- name: HYPERKITTY_API_KEY
|
- name: HYPERKITTY_API_KEY
|
||||||
value: {{ .Values.hyperkittyApiKey }}
|
value: {{ .Values.hyperkittyApiKey }}
|
||||||
- name: HYPERKITTY_URL
|
- name: HYPERKITTY_URL
|
||||||
|
|||||||
@@ -19,11 +19,11 @@ spec:
|
|||||||
{{- if .Values.ingress.tls }}
|
{{- if .Values.ingress.tls }}
|
||||||
tls:
|
tls:
|
||||||
- hosts:
|
- hosts:
|
||||||
- {{ .Values.ingress.host }}
|
- {{ .Values.hostname }}
|
||||||
secretName: {{ include "mailman3.fullname" . }}-certificate
|
secretName: {{ include "mailman3.fullname" . }}-certificate
|
||||||
{{- end }}
|
{{- end }}
|
||||||
rules:
|
rules:
|
||||||
- host: {{ .Values.ingress.host | quote }}
|
- host: {{ .Values.hostname | quote }}
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ spec:
|
|||||||
value: http://{{ include "mailman3.fullname" . }}-web.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:80
|
value: http://{{ include "mailman3.fullname" . }}-web.{{ .Release.Namespace }}.svc.{{ $clusterDomain }}:80
|
||||||
{{- if .Values.ingress.enabled }}
|
{{- if .Values.ingress.enabled }}
|
||||||
- name: SERVE_FROM_DOMAIN
|
- name: SERVE_FROM_DOMAIN
|
||||||
value: {{ .Values.ingress.host | quote }}
|
value: {{ .Values.hostname | quote }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: DATABASE_URL
|
- name: DATABASE_URL
|
||||||
value: sqlite://///opt/mailman-web-data/mailmanweb.db
|
value: sqlite://///opt/mailman-web-data/mailmanweb.db
|
||||||
|
|||||||
@@ -12,6 +12,8 @@
|
|||||||
#hyperkittyApiKey: supersecret
|
#hyperkittyApiKey: supersecret
|
||||||
#djangoSecretKey: supersecret
|
#djangoSecretKey: supersecret
|
||||||
|
|
||||||
|
hostname: lists.example.org
|
||||||
|
|
||||||
imagePullSecrets: []
|
imagePullSecrets: []
|
||||||
nameOverride: ""
|
nameOverride: ""
|
||||||
fullnameOverride: ""
|
fullnameOverride: ""
|
||||||
@@ -44,6 +46,7 @@ core:
|
|||||||
# cpu: 100m
|
# cpu: 100m
|
||||||
# memory: 128Mi
|
# memory: 128Mi
|
||||||
persistence:
|
persistence:
|
||||||
|
# persistence.existingClaim: ...
|
||||||
size: 100Gi
|
size: 100Gi
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
|
|
||||||
@@ -58,6 +61,7 @@ web:
|
|||||||
affinity: {}
|
affinity: {}
|
||||||
resources: {}
|
resources: {}
|
||||||
persistence:
|
persistence:
|
||||||
|
# persistence.existingClaim: ...
|
||||||
size: 100Gi
|
size: 100Gi
|
||||||
accessMode: ReadWriteOnce
|
accessMode: ReadWriteOnce
|
||||||
|
|
||||||
@@ -72,9 +76,3 @@ ingress:
|
|||||||
#kubernetes.io/ingress.class: "nginx"
|
#kubernetes.io/ingress.class: "nginx"
|
||||||
# use Cert-Manager for LetsEncrypt Certificates
|
# use Cert-Manager for LetsEncrypt Certificates
|
||||||
#cert-manager.io/issuer: "letsencrypt-prod"
|
#cert-manager.io/issuer: "letsencrypt-prod"
|
||||||
host: mailman3.example.org
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user