From cdeea50e17bda7cbc6f5ef535434da8a672dad9e Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Sat, 21 Dec 2019 15:00:19 +0800
Subject: [PATCH 1/9] Kafka 2.4.0

---
 avro-tools/test/rest-curl.yml                   | 2 +-
 kafka/50kafka.yml                               | 2 +-
 kafka/test/produce-consume.yml                  | 4 ++--
 maintenance/preferred-replica-election-job.yml  | 2 +-
 maintenance/reassign-paritions-job.yml          | 2 +-
 maintenance/replication-factor-increase-job.yml | 2 +-
 maintenance/test/replicated-partitions.yml      | 2 +-
 zookeeper/50pzoo.yml                            | 2 +-
 zookeeper/51zoo.yml                             | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/avro-tools/test/rest-curl.yml b/avro-tools/test/rest-curl.yml
index 10f488e2..b0e581b8 100644
--- a/avro-tools/test/rest-curl.yml
+++ b/avro-tools/test/rest-curl.yml
@@ -114,7 +114,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
index 5a162945..63ca9363 100644
--- a/kafka/50kafka.yml
+++ b/kafka/50kafka.yml
@@ -45,7 +45,7 @@ spec:
           mountPath: /opt/kafka/libs/extensions
       containers:
       - name: broker
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: CLASSPATH
           value: /opt/kafka/libs/extensions/*
diff --git a/kafka/test/produce-consume.yml b/kafka/test/produce-consume.yml
index 7a03dd4f..5450b420 100644
--- a/kafka/test/produce-consume.yml
+++ b/kafka/test/produce-consume.yml
@@ -99,7 +99,7 @@ spec:
     spec:
       containers:
       - name: producer
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
@@ -127,7 +127,7 @@ spec:
         - name: shared
           mountPath: /shared
       - name: consumer
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
diff --git a/maintenance/preferred-replica-election-job.yml b/maintenance/preferred-replica-election-job.yml
index 96f1982a..f8b65eff 100644
--- a/maintenance/preferred-replica-election-job.yml
+++ b/maintenance/preferred-replica-election-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         command:
         - ./bin/kafka-preferred-replica-election.sh
         - --zookeeper
diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml
index e55c998e..15459c73 100644
--- a/maintenance/reassign-paritions-job.yml
+++ b/maintenance/reassign-paritions-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/replication-factor-increase-job.yml b/maintenance/replication-factor-increase-job.yml
index 42985fda..0df40e02 100644
--- a/maintenance/replication-factor-increase-job.yml
+++ b/maintenance/replication-factor-increase-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/test/replicated-partitions.yml b/maintenance/test/replicated-partitions.yml
index 3b90de8c..4695a496 100644
--- a/maintenance/test/replicated-partitions.yml
+++ b/maintenance/test/replicated-partitions.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         command:
         - /bin/bash
         - -ec
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index 0b724885..e9b4fcc5 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -34,7 +34,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index f6220e83..de5d15e1 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -37,7 +37,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.3.0@sha256:b59603a8c0645f792fb54e9571500e975206352a021d6a116b110945ca6c3a1d
+        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties

From 7ffbfdc9b58214e67b8ab932ded3905aae82ec77 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Sat, 21 Dec 2019 15:12:47 +0800
Subject: [PATCH 2/9] Should use defaults now, but we need kafka-cli built from
 2.4.0

---
 kafka/test/kafkacat.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kafka/test/kafkacat.yml b/kafka/test/kafkacat.yml
index 749fa7fe..fad38f97 100644
--- a/kafka/test/kafkacat.yml
+++ b/kafka/test/kafkacat.yml
@@ -81,10 +81,6 @@ spec:
         - --if-not-exists
         - --topic
         -   test-kafkacat
-        - --partitions
-        -   "3"
-        - --replication-factor
-        -   "2"
         resources:
           limits:
             cpu: 200m

From 534f448e7c05c1c0cbbda56ff52cb241bf7624ed Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 23 Dec 2019 13:12:31 +0800
Subject: [PATCH 3/9] Use the tagged build

---
 avro-tools/test/rest-curl.yml                   | 2 +-
 kafka/50kafka.yml                               | 2 +-
 kafka/test/produce-consume.yml                  | 4 ++--
 maintenance/preferred-replica-election-job.yml  | 2 +-
 maintenance/reassign-paritions-job.yml          | 2 +-
 maintenance/replication-factor-increase-job.yml | 2 +-
 maintenance/test/replicated-partitions.yml      | 2 +-
 zookeeper/50pzoo.yml                            | 2 +-
 zookeeper/51zoo.yml                             | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/avro-tools/test/rest-curl.yml b/avro-tools/test/rest-curl.yml
index b0e581b8..4b44cafd 100644
--- a/avro-tools/test/rest-curl.yml
+++ b/avro-tools/test/rest-curl.yml
@@ -114,7 +114,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
index 63ca9363..9258f716 100644
--- a/kafka/50kafka.yml
+++ b/kafka/50kafka.yml
@@ -45,7 +45,7 @@ spec:
           mountPath: /opt/kafka/libs/extensions
       containers:
       - name: broker
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: CLASSPATH
           value: /opt/kafka/libs/extensions/*
diff --git a/kafka/test/produce-consume.yml b/kafka/test/produce-consume.yml
index 5450b420..e2a1408a 100644
--- a/kafka/test/produce-consume.yml
+++ b/kafka/test/produce-consume.yml
@@ -99,7 +99,7 @@ spec:
     spec:
       containers:
       - name: producer
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
@@ -127,7 +127,7 @@ spec:
         - name: shared
           mountPath: /shared
       - name: consumer
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
diff --git a/maintenance/preferred-replica-election-job.yml b/maintenance/preferred-replica-election-job.yml
index f8b65eff..ef6de672 100644
--- a/maintenance/preferred-replica-election-job.yml
+++ b/maintenance/preferred-replica-election-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         command:
         - ./bin/kafka-preferred-replica-election.sh
         - --zookeeper
diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml
index 15459c73..57e233db 100644
--- a/maintenance/reassign-paritions-job.yml
+++ b/maintenance/reassign-paritions-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/replication-factor-increase-job.yml b/maintenance/replication-factor-increase-job.yml
index 0df40e02..80806675 100644
--- a/maintenance/replication-factor-increase-job.yml
+++ b/maintenance/replication-factor-increase-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/test/replicated-partitions.yml b/maintenance/test/replicated-partitions.yml
index 4695a496..566af715 100644
--- a/maintenance/test/replicated-partitions.yml
+++ b/maintenance/test/replicated-partitions.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         command:
         - /bin/bash
         - -ec
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index e9b4fcc5..1116845b 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -34,7 +34,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index de5d15e1..df0fc900 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -37,7 +37,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:latest@sha256:bc6aa2962c772733a07ed9ccbc48c8b218f8c42889c83e251665d193015a2a2f
+        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties

From 363e3de79baea8bb8bcc55e3e1cb8717363369c1 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Sat, 11 Jan 2020 10:21:08 +0100
Subject: [PATCH 4/9] Allows our readiness probe with zookeeper >=3.5.3

Without this zookeeper would reply: ruok is not executed because it is not in the whitelist

Fixes #298, according to tests with variants/dev-small and regular apply -k on k3s
---
 zookeeper/10zookeeper-config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml
index ed0d538d..e2bf8cba 100644
--- a/zookeeper/10zookeeper-config.yml
+++ b/zookeeper/10zookeeper-config.yml
@@ -22,6 +22,7 @@ data:
     sed -i "s/server\.$ZOOKEEPER_SERVER_ID\=[a-z0-9.-]*/server.$ZOOKEEPER_SERVER_ID=0.0.0.0/" /etc/kafka/zookeeper.properties
 
   zookeeper.properties: |
+    4lw.commands.whitelist=ruok
     tickTime=2000
     dataDir=/var/lib/zookeeper/data
     dataLogDir=/var/lib/zookeeper/log

From 05e0433076b2337640a0392d7c7ec3c8b0eca528 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Sat, 11 Jan 2020 10:32:26 +0100
Subject: [PATCH 5/9] Will merge the storage class change #294 prior to the
 2.4.0 upgrade

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cd42b1ff..552d8fa5 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ Then pick and chose from patches our [example variants](https://github.com/Yolea
 
 | tag    | k8s ≥ | highlights  |
 | ------ | ----- | ----------- |
+|  TBD   | 1.13+ | Kafka [2.4.0](https://github.com/Yolean/kubernetes-kafka/pull/297) + [standard storage class](https://github.com/Yolean/kubernetes-kafka/pull/294) |
 | v6.0.0 | 1.11+ | Kafka 2.2.0 + `apply -k` (kubectl 1.14+) + [#270](https://github.com/Yolean/kubernetes-kafka/pull/270) |
 | v5.1.0 | 1.11+ | Kafka 2.1.1 |
 | v5.0.3 | 1.11+ | Zookeeper fix [#227](https://github.com/Yolean/kubernetes-kafka/pull/227) + [maxClientCnxns=1](https://github.com/Yolean/kubernetes-kafka/pull/230#issuecomment-445953857) |

From b511a08cb967fbae67fc4aae563fa7c1340ddbd5 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 24 Feb 2020 21:14:55 +0100
Subject: [PATCH 6/9] Will default to empty, hence advertising hostname, as
 before

---
 kafka/10broker-config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml
index c415ab7a..55721e2d 100644
--- a/kafka/10broker-config.yml
+++ b/kafka/10broker-config.yml
@@ -28,7 +28,7 @@ data:
 
       OUTSIDE_HOST=$(kubectl get node "$NODE_NAME" -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}')
       OUTSIDE_PORT=$((32400 + ${KAFKA_BROKER_ID}))
-      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
+      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://${ADVERTISE_ADDRESS}:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
       ANNOTATIONS="$ANNOTATIONS kafka-listener-outside-host=$OUTSIDE_HOST kafka-listener-outside-port=$OUTSIDE_PORT"
 
       if [ ! -z "$LABELS" ]; then

From 64bf94a887000f6775ccfe75ec4911b444e369f3 Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 24 Feb 2020 21:17:21 +0100
Subject: [PATCH 7/9] Clarifies that the env isn't required

---
 kafka/10broker-config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml
index 55721e2d..b1a0249d 100644
--- a/kafka/10broker-config.yml
+++ b/kafka/10broker-config.yml
@@ -26,9 +26,10 @@ data:
         LABELS="$LABELS kafka-broker-rack=$ZONE"
       fi
 
+      [ -z "$INSIDE_HOST" ] && echo "INSIDE_HOST is empty, will advetise detected DNS name"
       OUTSIDE_HOST=$(kubectl get node "$NODE_NAME" -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}')
       OUTSIDE_PORT=$((32400 + ${KAFKA_BROKER_ID}))
-      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://${ADVERTISE_ADDRESS}:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
+      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://${INSIDE_HOST}:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
       ANNOTATIONS="$ANNOTATIONS kafka-listener-outside-host=$OUTSIDE_HOST kafka-listener-outside-port=$OUTSIDE_PORT"
 
       if [ ! -z "$LABELS" ]; then

From 31e39854d6b49b45b2326dcc4481ce576fa7aeeb Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Mon, 24 Feb 2020 21:34:27 +0100
Subject: [PATCH 8/9] Demonstrates how to advertise pod IP instead of name,

useful for GKE VPC-native clusters
---
 kafka/10broker-config.yml                    |  4 ++--
 variants/advertise-pod-ip/kafka.yaml         | 14 ++++++++++++++
 variants/advertise-pod-ip/kustomization.yaml |  4 ++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 variants/advertise-pod-ip/kafka.yaml
 create mode 100644 variants/advertise-pod-ip/kustomization.yaml

diff --git a/kafka/10broker-config.yml b/kafka/10broker-config.yml
index b1a0249d..857e1f13 100644
--- a/kafka/10broker-config.yml
+++ b/kafka/10broker-config.yml
@@ -26,10 +26,10 @@ data:
         LABELS="$LABELS kafka-broker-rack=$ZONE"
       fi
 
-      [ -z "$INSIDE_HOST" ] && echo "INSIDE_HOST is empty, will advetise detected DNS name"
+      [ -z "$ADVERTISE_ADDR" ] && echo "ADVERTISE_ADDR is empty, will advertise detected DNS name"
       OUTSIDE_HOST=$(kubectl get node "$NODE_NAME" -o jsonpath='{.status.addresses[?(@.type=="InternalIP")].address}')
       OUTSIDE_PORT=$((32400 + ${KAFKA_BROKER_ID}))
-      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://${INSIDE_HOST}:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
+      SEDS+=("s|#init#advertised.listeners=PLAINTEXT://#init#|advertised.listeners=PLAINTEXT://${ADVERTISE_ADDR}:9092,OUTSIDE://${OUTSIDE_HOST}:${OUTSIDE_PORT}|")
       ANNOTATIONS="$ANNOTATIONS kafka-listener-outside-host=$OUTSIDE_HOST kafka-listener-outside-port=$OUTSIDE_PORT"
 
       if [ ! -z "$LABELS" ]; then
diff --git a/variants/advertise-pod-ip/kafka.yaml b/variants/advertise-pod-ip/kafka.yaml
new file mode 100644
index 00000000..3c9cf675
--- /dev/null
+++ b/variants/advertise-pod-ip/kafka.yaml
@@ -0,0 +1,14 @@
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: kafka
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: init-config
+        env:
+        - name: ADVERTISE_ADDR
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
diff --git a/variants/advertise-pod-ip/kustomization.yaml b/variants/advertise-pod-ip/kustomization.yaml
new file mode 100644
index 00000000..d6d46f41
--- /dev/null
+++ b/variants/advertise-pod-ip/kustomization.yaml
@@ -0,0 +1,4 @@
+bases:
+- ../scale-3-5
+patchesStrategicMerge:
+- kafka.yaml

From a155c0c112078b2047b7648bf376c8f139a942fb Mon Sep 17 00:00:00 2001
From: Staffan Olsson <staffan@repos.se>
Date: Tue, 3 Mar 2020 19:27:03 +0100
Subject: [PATCH 9/9] AdoptOpenJDK bumped to 11.0.6

---
 avro-tools/test/rest-curl.yml                   | 2 +-
 kafka/50kafka.yml                               | 2 +-
 kafka/test/produce-consume.yml                  | 4 ++--
 maintenance/preferred-replica-election-job.yml  | 2 +-
 maintenance/reassign-paritions-job.yml          | 2 +-
 maintenance/replication-factor-increase-job.yml | 2 +-
 maintenance/test/replicated-partitions.yml      | 2 +-
 zookeeper/50pzoo.yml                            | 2 +-
 zookeeper/51zoo.yml                             | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/avro-tools/test/rest-curl.yml b/avro-tools/test/rest-curl.yml
index 4b44cafd..a1e35e21 100644
--- a/avro-tools/test/rest-curl.yml
+++ b/avro-tools/test/rest-curl.yml
@@ -114,7 +114,7 @@ spec:
     spec:
       containers:
       - name: topic-create
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         command:
         - ./bin/kafka-topics.sh
         - --zookeeper
diff --git a/kafka/50kafka.yml b/kafka/50kafka.yml
index c8cf8d06..e0b52999 100644
--- a/kafka/50kafka.yml
+++ b/kafka/50kafka.yml
@@ -45,7 +45,7 @@ spec:
           mountPath: /opt/kafka/libs/extensions
       containers:
       - name: broker
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: CLASSPATH
           value: /opt/kafka/libs/extensions/*
diff --git a/kafka/test/produce-consume.yml b/kafka/test/produce-consume.yml
index e2a1408a..0b29b7cc 100644
--- a/kafka/test/produce-consume.yml
+++ b/kafka/test/produce-consume.yml
@@ -99,7 +99,7 @@ spec:
     spec:
       containers:
       - name: producer
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
@@ -127,7 +127,7 @@ spec:
         - name: shared
           mountPath: /shared
       - name: consumer
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: BOOTSTRAP
           value: bootstrap.kafka:9092
diff --git a/maintenance/preferred-replica-election-job.yml b/maintenance/preferred-replica-election-job.yml
index ef6de672..b5e1d407 100644
--- a/maintenance/preferred-replica-election-job.yml
+++ b/maintenance/preferred-replica-election-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         command:
         - ./bin/kafka-preferred-replica-election.sh
         - --zookeeper
diff --git a/maintenance/reassign-paritions-job.yml b/maintenance/reassign-paritions-job.yml
index 57e233db..b7562921 100644
--- a/maintenance/reassign-paritions-job.yml
+++ b/maintenance/reassign-paritions-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/replication-factor-increase-job.yml b/maintenance/replication-factor-increase-job.yml
index 80806675..9270f878 100644
--- a/maintenance/replication-factor-increase-job.yml
+++ b/maintenance/replication-factor-increase-job.yml
@@ -10,7 +10,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: ZOOKEEPER
           value: zookeeper.kafka:2181
diff --git a/maintenance/test/replicated-partitions.yml b/maintenance/test/replicated-partitions.yml
index 566af715..f4982b30 100644
--- a/maintenance/test/replicated-partitions.yml
+++ b/maintenance/test/replicated-partitions.yml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: kafka
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         command:
         - /bin/bash
         - -ec
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index 0e098e1d..c5f6d1f6 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -34,7 +34,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index 0bcc2f42..5aa8ec5e 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -37,7 +37,7 @@ spec:
           mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
-        image: solsson/kafka:2.4.0@sha256:17f35e6dc3b5687107e0dae4cc0f3fc30d6613724e7b75fc1ed4d1a6f0744965
+        image: solsson/kafka:2.4.0@sha256:201a1c7fd378405b6b1bfd801127c8a530ed7a971282bfcee4ec731bc0c50ad2
         env:
         - name: KAFKA_LOG4J_OPTS
           value: -Dlog4j.configuration=file:/etc/kafka/log4j.properties