Merge pull request #330 from tusciucalecs/issue_267

[Issue #267] Support fullnameOverride in kibana, filebeat, metricbeat…
mtp-devops · Nov 18, 2019 · db3c1a0 · db3c1a0
2 parents a33bc1e + 9536fce
commit db3c1a0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/filebeat/README.md b/filebeat/README.md
@@ -81,6 +81,7 @@ helm install --name filebeat elastic/filebeat --set imageTag=7.4.1
 | `affinity`               | Configurable [affinity](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity)                                                                                                                                                      | `{}`                                                                                                                      |
 | `priorityClassName`      | The [name of the PriorityClass](https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass). No default is supplied as the PriorityClass must be created first.                                                                               | `""`                                                                                                                      |
 | `updateStrategy`         | The [updateStrategy](https://kubernetes.io/docs/tasks/manage-daemon/update-daemon-set/#daemonset-update-strategy) for the `DaemonSet`. By default Kubernetes will kill and recreate pods on updates. Setting this to `OnDelete` will require that pods be deleted manually. | `RollingUpdate`                                                                                                           |
+| `fullnameOverride`       | Overrides the full name of the resources. If not set the name will default to "`.Release.Name`-`.Values.nameOverride or .Chart.Name`"                                                                                                                                       | `""`                                                                                                                      |
 
 ## Examples
 

diff --git a/filebeat/templates/_helpers.tpl b/filebeat/templates/_helpers.tpl
@@ -11,9 +11,13 @@ 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).
 */}}
 {{- define "fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Use the fullname if the serviceAccount value is not set

diff --git a/kibana/README.md b/kibana/README.md
@@ -82,6 +82,7 @@ helm install --name kibana elastic/kibana --set imageTag=7.4.1
 | `service`                 | Configurable [service](https://kubernetes.io/docs/concepts/services-networking/service/) to expose the Kibana service. See [`values.yaml`](./values.yaml) for an example                                                                                                                                                                                       | `type: ClusterIP`<br>`port: 5601`<br>`nodePort:`<br>`annotations: {}`                                                     |
 | `labels`                  | Configurable [label](https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/) applied to all Kibana pods                                                                                                                                                                                                                                     | `{}`                                                                                                                      |
 | `lifecycle`               | Allows you to add lifecycle configuration. See [values.yaml](./values.yaml) for an example of the formatting.                                                                                                                                                                                                                                                  | `{}`                                                                                                                      |
+| `fullnameOverride`       | Overrides the full name of the resources. If not set the name will default to "`.Release.Name`-`.Values.nameOverride or .Chart.Name`"                                                                                                                                       | `""`                                                                                                                      |
 
 ## Examples
 

diff --git a/kibana/templates/_helpers.tpl b/kibana/templates/_helpers.tpl
@@ -11,9 +11,13 @@ 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).
 */}}
 {{- define "fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Release.Name .Values.nameOverride -}}
 {{- printf "%s-%s" $name .Chart.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Return the appropriate apiVersion for ingress.