From f6bcdb9bb5d83ef4d5c08b662845d5c09768f6e8 Mon Sep 17 00:00:00 2001
From: Oleg Ivanov <olivanov87@gmail.com>
Date: Fri, 18 Jan 2019 13:14:46 +0200
Subject: [PATCH] Fixed the broker id (#10591)

Signed-off-by: IvanovOleg <olivanov87@gmail.com>
---
 incubator/kafka/Chart.yaml                 | 2 +-
 incubator/kafka/templates/statefulset.yaml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/incubator/kafka/Chart.yaml b/incubator/kafka/Chart.yaml
index 13299510fb..975254c7eb 100755
--- a/incubator/kafka/Chart.yaml
+++ b/incubator/kafka/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 description: Apache Kafka is publish-subscribe messaging rethought as a distributed
   commit log.
 name: kafka
-version: 0.13.4
+version: 0.13.5
 appVersion: 5.0.1
 keywords:
 - kafka
diff --git a/incubator/kafka/templates/statefulset.yaml b/incubator/kafka/templates/statefulset.yaml
index 0ac8492d11..17e767b753 100644
--- a/incubator/kafka/templates/statefulset.yaml
+++ b/incubator/kafka/templates/statefulset.yaml
@@ -154,6 +154,10 @@ spec:
         - name: JMX_PORT
           value: "{{ .Values.jmx.port }}"
         {{- end }}
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: POD_IP
           valueFrom:
             fieldRef:
@@ -200,7 +204,7 @@ spec:
         - -exc
         - |
           unset KAFKA_PORT && \
-          export KAFKA_BROKER_ID=${HOSTNAME##*-} && \
+          export KAFKA_BROKER_ID=${POD_NAME##*-} && \
           export KAFKA_ADVERTISED_LISTENERS=PLAINTEXT://${POD_IP}:9092{{ if kindIs "string" $advertisedListenersOverride }}{{ printf ",%s" $advertisedListenersOverride }}{{ end }} && \
           exec /etc/confluent/docker/run
         volumeMounts: