diff --git a/assets/auto-deploy-app/templates/NOTES.txt b/assets/auto-deploy-app/templates/NOTES.txt index 5491ce9318e4fd2578c6c86de79f2bd268d00739..ab3bb01b9215758ca80f6e752e57e9e6995c8e73 100644 --- a/assets/auto-deploy-app/templates/NOTES.txt +++ b/assets/auto-deploy-app/templates/NOTES.txt @@ -1,11 +1,11 @@ {{- if and .Values.ingress.enabled .Values.service.enabled -}} Application should be accessible at - {{ .Values.service.url }} +{{ include "appurls" . | indent 4 }} {{- else -}} Application was deployed reusing the service at - {{ .Values.service.url }} +{{ include "appurls" . | indent 4 }} It will share a load balancer with the previous release (or be unavailable if no service or ingress was previously deployed). diff --git a/assets/auto-deploy-app/templates/_helpers.tpl b/assets/auto-deploy-app/templates/_helpers.tpl index 1303e32eb5c2f1c962d888432b63f5e663a0adb9..c7e4f629b7ea02d8e015bee28a62732e9afc6eae 100644 --- a/assets/auto-deploy-app/templates/_helpers.tpl +++ b/assets/auto-deploy-app/templates/_helpers.tpl @@ -90,3 +90,12 @@ app.kubernetes.io/instance: {{ .Release.Name }} {{- $merged := deepCopy $custom | mergeOverwrite $defaults -}} {{- $merged | toYaml -}} {{- end -}} + +{{- define "appurls" -}} +{{ printf "%s%s" .Values.service.url .Values.ingress.path }} +{{- if .Values.service.additionalHosts }} +{{- range $host := .Values.service.additionalHosts }} +{{ if $.Values.ingress.tls.enabled }}https://{{ else }}http://{{ end }}{{ printf "%s%s" $host $.Values.ingress.path }} +{{- end -}} +{{- end -}} +{{- end -}}