From cbfec0b8fa514583ebd220ee4f27a3f278f66207 Mon Sep 17 00:00:00 2001 From: Denis Sventitsky Date: Sat, 8 Feb 2020 07:35:53 +0300 Subject: [PATCH] [stable/metabase] Support fullnameOverride in _helpers.tpl (#20579) * Support fullnameOverride in _helpers.tpl Signed-off-by: Denis Sventitsky * Bump chart version Signed-off-by: Denis Sventitsky * Update README.md with fullnameOverride parameter Signed-off-by: Denis Sventitsky --- stable/metabase/Chart.yaml | 2 +- stable/metabase/README.md | 1 + stable/metabase/templates/_helpers.tpl | 9 +++++++++ stable/metabase/values.yaml | 4 ++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/stable/metabase/Chart.yaml b/stable/metabase/Chart.yaml index 289f3aa838..3b2849e91d 100644 --- a/stable/metabase/Chart.yaml +++ b/stable/metabase/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: The easy, open source way for everyone in your company to ask questions and learn from data. name: metabase -version: 0.10.2 +version: 0.10.3 appVersion: v0.34.0 maintainers: - name: pmint93 diff --git a/stable/metabase/README.md b/stable/metabase/README.md index 6375c56535..44b580e3ae 100644 --- a/stable/metabase/README.md +++ b/stable/metabase/README.md @@ -50,6 +50,7 @@ The following table lists the configurable parameters of the Metabase chart and | image.repository | controller container image repository | metabase/metabase | | image.tag | controller container image tag | v0.34.0 | | image.pullPolicy | controller container image pull policy | IfNotPresent | +| fullnameOverride | String to fully override metabase.fullname template | null | | listen.host | Listening on a specific network host | 0.0.0.0 | | listen.port | Listening on a specific network port | 3000 | | ssl.enabled | Enable SSL to run over HTTPS | false | diff --git a/stable/metabase/templates/_helpers.tpl b/stable/metabase/templates/_helpers.tpl index 979458530a..f396a51c4b 100644 --- a/stable/metabase/templates/_helpers.tpl +++ b/stable/metabase/templates/_helpers.tpl @@ -9,11 +9,20 @@ Expand the name of the chart. {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +If release name contains chart name it will be used as a full name. */}} {{- define "metabase.fullname" -}} +{{- if .Values.fullnameOverride -}} +{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- $name := default .Chart.Name .Values.nameOverride -}} +{{- if contains $name .Release.Name -}} +{{- printf .Release.Name | trunc 63 | trimSuffix "-" -}} +{{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} +{{- end -}} +{{- end -}} {{/* Return the apiVersion of deployment. diff --git a/stable/metabase/values.yaml b/stable/metabase/values.yaml index 5b8d874634..44e7bbca4e 100644 --- a/stable/metabase/values.yaml +++ b/stable/metabase/values.yaml @@ -10,6 +10,10 @@ image: tag: v0.34.0 pullPolicy: IfNotPresent +## String to fully override metabase.fullname template +## +# fullnameOverride: + # Config Jetty web server listen: host: "0.0.0.0"