Skip to content

Commit

Permalink
fix(elastic): fix kibana full name override
Browse files Browse the repository at this point in the history
NOTES:

The kibana chart did not respect the `fullnameOverride` in the template
helpers despite including fullNameOverride in the values.yaml. This
resolves that issue.

See:
elastic/helm-charts#330 (comment)
  • Loading branch information
dmccaffery committed Nov 5, 2019
1 parent 0cf6720 commit b9d80b3
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions charts/elastic/kibana/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,19 @@ 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 "fullname" -}}
{{- $name := default .Release.Name .Values.nameOverride -}}
{{- printf "%s-%s" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
{{- define "helm-operator.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}

{{/*
Expand Down

0 comments on commit b9d80b3

Please sign in to comment.