From d2a17c0097c2eb4434681fd7ac75173bf3470401 Mon Sep 17 00:00:00 2001
From: Doug Szumski <doug@stackhpc.com>
Date: Mon, 13 Jan 2020 10:20:57 +0000
Subject: [PATCH] Upgrade Kafka to 2.0.1 release

We upgrade to 2.0.1 and not a newer version because Monasca currently
supports 2.0.1.

This also brings the Kafka release inline with the current Zookeeper
version for the 5.0.x Confluent platform [1].

[1] https://docs.confluent.io/current/installation/versions-interoperability.html

Change-Id: I835d10bfe3ac0ea7382387a27b222849afb84aa3
---
 docker/kafka/Dockerfile.j2                             | 4 ++--
 releasenotes/notes/upgrade-kafka-c52e0ad07e11b69d.yaml | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/upgrade-kafka-c52e0ad07e11b69d.yaml

diff --git a/docker/kafka/Dockerfile.j2 b/docker/kafka/Dockerfile.j2
index bcb79d8a88..0903391670 100644
--- a/docker/kafka/Dockerfile.j2
+++ b/docker/kafka/Dockerfile.j2
@@ -27,10 +27,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(kafka_packages | customizable("packages")) }}
 
 {% block kafka_version %}
-ENV kafka_version=1.0.2
+ENV kafka_version=2.0.1
 ENV kafka_scala_version=2.12
 ENV kafka_url=https://archive.apache.org/dist/kafka/${kafka_version}/kafka_${kafka_scala_version}-${kafka_version}.tgz
-ENV kafka_pkg_sha512sum=4cbcdaf8ccc4efe3d1b6275f3f2c32cf8f2f1a62104b5dd0bd9e2974160ab89d85a6e1791af8b948a413b99ed696b06ea9d4299b27ea63c3f7318dabf5761144
+ENV kafka_pkg_sha512sum=9773a85ef2898b4bae20481df4cfd5488bd195fffd700fcc874a9fa55065f6873f2ee12f46d2f6a6ccb5d5a93ddb7dec19227aef5d39d4f72b545ec63b24bb2f
 {% endblock %}
 
 {% block kafka_install %}
diff --git a/releasenotes/notes/upgrade-kafka-c52e0ad07e11b69d.yaml b/releasenotes/notes/upgrade-kafka-c52e0ad07e11b69d.yaml
new file mode 100644
index 0000000000..58b9775886
--- /dev/null
+++ b/releasenotes/notes/upgrade-kafka-c52e0ad07e11b69d.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Upgrades Kafka from 1.0.2 to 2.0.1. Please see the `upgrade notes
+    <https://kafka.apache.org/documentation/#upgrade_2_0_1>`__ for
+    more details.