From 86872abf446ca99afb197caae5758dcdba860342 Mon Sep 17 00:00:00 2001
From: Vadym Perepeliak <vadym.perepeliak@comarch.com>
Date: Tue, 16 Jul 2019 16:01:47 +0200
Subject: [PATCH] [bitnami/kafka] Fix zookeeper name helper

---
 bitnami/kafka/Chart.yaml             | 2 +-
 bitnami/kafka/templates/_helpers.tpl | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index 4aa906246a..4e1eec352f 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: kafka
-version: 3.0.14
+version: 3.0.15
 appVersion: 2.3.0
 description: Apache Kafka is a distributed streaming platform.
 keywords:
diff --git a/bitnami/kafka/templates/_helpers.tpl b/bitnami/kafka/templates/_helpers.tpl
index 70219ce73d..667f05051f 100644
--- a/bitnami/kafka/templates/_helpers.tpl
+++ b/bitnami/kafka/templates/_helpers.tpl
@@ -100,13 +100,18 @@ Also, we can't use a single if because lazy evaluation is not an option
 {{- end -}}
 {{- end -}}
 
+{{/*
 Create a default fully qualified zookeeper name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "kafka.zookeeper.fullname" -}}
+{{- if .Values.zookeeper.fullnameOverride -}}
+{{- .Values.zookeeper.fullnameOverride | trunc 24 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default "zookeeper" .Values.zookeeper.nameOverride -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 24 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
 
 {{/*
 Return the proper Docker Image Registry Secret Names