Commit 3ee962a9 authored by Sandro Mathys's avatar Sandro Mathys
Browse files

make remoteURL, nameOverride and fullnameOverride templateable

parent 8d23f1c9
......@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.4.0
version: 0.4.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
......
......@@ -2,7 +2,7 @@
Expand the name of the chart.
*/}}
{{- define "shibboleth-sp.name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
{{- default .Chart.Name (tpl .Values.nameOverride .) | trunc 63 | trimSuffix "-" }}
{{- end }}
{{/*
......@@ -13,9 +13,9 @@ If release name contains chart name it will be used as a full name.
*/}}
{{- define "shibboleth-sp.fullname" -}}
{{- if .Values.fullnameOverride }}
{{- .Values.fullnameOverride | trunc 54 | trimSuffix "-" }}
{{- (tpl .Values.fullnameOverride .) | trunc 54 | trimSuffix "-" }}
{{- else }}
{{- $name := default .Chart.Name .Values.nameOverride }}
{{- $name := default .Chart.Name (tpl .Values.nameOverride .) }}
{{- if contains $name .Release.Name }}
{{- .Release.Name | trunc 54 | trimSuffix "-" }}
{{- else }}
......
......@@ -110,8 +110,8 @@ data:
ServerAlias http://{{ tpl .Values.global.domainName . }}
ServerAlias http://*.{{ tpl .Values.global.domainName . }}
ProxyPass "/" "{{ .Values.frontend.apache.remoteURL }}"
ProxyPassReverse "/" "{{ .Values.frontend.apache.remoteURL }}"
ProxyPass "/" "{{ tpl .Values.frontend.apache.remoteURL . }}"
ProxyPassReverse "/" "{{ tpl .Values.frontend.apache.remoteURL . }}"
<Location />
# This exception is required as OPTIONS requests come with no cookie
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment