Merge pull request #457 from morganchristiansson/logstash-fullnameove…

…rride [logstash] Add fullnameOverride setting
elastic · Jan 31, 2020 · 8e10ead · 8e10ead
2 parents 7917345 + 147d4d4
commit 8e10ead
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/logstash/README.md b/logstash/README.md
@@ -101,6 +101,7 @@ helm install --name logstash elastic/logstash --set imageTag=7.5.2
 | `updateStrategy`              | The [updateStrategy](https://kubernetes.io/docs/tutorials/stateful-application/basic-stateful-set/#updating-statefulsets) for the statefulset. By default Kubernetes will wait for the cluster to be green after upgrading each pod. Setting this to `OnDelete` will allow you to manually delete each pod during upgrades | `RollingUpdate`                                                                                                            |
 | `volumeClaimTemplate`         | Configuration for the [volumeClaimTemplate for statefulsets](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#stable-storage). You will want to adjust the storage (default `30Gi`) and the `storageClassName` if you are using a different storage class                                            | `accessModes: [ "ReadWriteOnce" ]`<br>`resources.requests.storage: 1Gi`                                                    |
 | `rbac`                        | Configuration for creating a role, role binding and service account as part of this helm chart with `create: true`. Also can be used to reference an external service account with `serviceAccountName: "externalServiceAccountName"`.                                                                                     | `create: false`<br>`serviceAccountName: ""`                                                                                |
+| `fullnameOverride`            | Overrides the full name of the resources. If not set the name will default to "`.Release.Name`-`.Values.nameOverride or .Chart.Name`"                                                                                                                                                                                      | `""`                                                                                                                       |
 
 ## Try it out
 

diff --git a/logstash/templates/_helpers.tpl b/logstash/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 "logstash.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 -}}
 
 {{/*
 Return the appropriate apiVersion for statefulset.

diff --git a/logstash/tests/logstash_test.py b/logstash/tests/logstash_test.py
@@ -571,3 +571,13 @@ def test_adding_a_service():
     assert len(s['spec']['ports']) == 1
     assert s['spec']['ports'][0] == {
         'name': 'beats', 'port': 5044, 'protocol': 'TCP', 'targetPort': 5044}
+
+def test_setting_fullnameOverride():
+    config = '''
+fullnameOverride: 'logstash-custom'
+'''
+    r = helm_template(config)
+
+    custom_name = 'logstash-custom'
+    assert custom_name in r['statefulset']
+    assert r['statefulset'][custom_name]['spec']['template']['spec']['containers'][0]['name'] == 'logstash'