From 7baeea1cb66be576cb27be8ddc955df8f666cf0c Mon Sep 17 00:00:00 2001
From: Louis Turmel <46848645+lturmel@users.noreply.github.com>
Date: Tue, 19 Jan 2021 04:22:58 -0500
Subject: [PATCH] bitnami/kafka Fix Upgrade regression from PR #4683 (#5073)

---
 bitnami/kafka/Chart.yaml                       | 2 +-
 bitnami/kafka/templates/scripts-configmap.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml
index 66ecc7f83d..c41a3e557f 100644
--- a/bitnami/kafka/Chart.yaml
+++ b/bitnami/kafka/Chart.yaml
@@ -29,4 +29,4 @@ name: kafka
 sources:
   - https://github.com/bitnami/bitnami-docker-kafka
   - https://kafka.apache.org/
-version: 12.6.0
+version: 12.6.1
diff --git a/bitnami/kafka/templates/scripts-configmap.yaml b/bitnami/kafka/templates/scripts-configmap.yaml
index 0b4f77dfeb..bee6040e44 100644
--- a/bitnami/kafka/templates/scripts-configmap.yaml
+++ b/bitnami/kafka/templates/scripts-configmap.yaml
@@ -71,10 +71,10 @@ data:
   setup.sh: |-
     #!/bin/bash
 
+    ID="${MY_POD_NAME#"{{ $fullname }}-"}"
     if [[ -f "/bitnami/kafka/data/meta.properties" ]]; then
         export KAFKA_CFG_BROKER_ID="$(grep "broker.id" /bitnami/kafka/data/meta.properties | awk -F '=' '{print $2}')"
     else
-        ID="${MY_POD_NAME#"{{ $fullname }}-"}"
         export KAFKA_CFG_BROKER_ID="$((ID + {{ .Values.minBrokerId }}))"
     fi