Fix fullnameOverride in Helm chart

Signed-off-by: Steven Sheehy <[email protected]>
grafana · Mar 6, 2019 · c366665 · c366665
1 parent 6284d22
commit c366665
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/production/helm/templates/loki/_helpers.tpl b/production/helm/templates/loki/_helpers.tpl
@@ -12,10 +12,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "loki.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- if .Values.loki.fullnameOverride -}}
+{{- .Values.loki.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- $name := default .Chart.Name .Values.loki.nameOverride -}}
 {{- if contains $name .Release.Name -}}
 {{- .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- else -}}

diff --git a/production/helm/templates/promtail/_helpers.tpl b/production/helm/templates/promtail/_helpers.tpl
@@ -12,8 +12,8 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "promtail.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- if .Values.promtail.fullnameOverride -}}
+{{- .Values.promtail.fullnameOverride | trunc 63 | trimSuffix "-" -}}
 {{- else -}}
 {{- $name := default .Chart.Name .Values.promtail.nameOverride -}}
 {{- if contains $name .Release.Name -}}