From 37aedb120611f067dbf97311dcee891cf3d2db83 Mon Sep 17 00:00:00 2001
From: Jinlin Yang <86577891+jinlintt@users.noreply.github.com>
Date: Fri, 1 Mar 2024 12:17:22 -0800
Subject: [PATCH] Bump kafka chart to 26.11.2 that uses kafka 3.6.1 (#431)

* Bump kafka chart to 26.11.2, which uses kafka 3.6.1
* Override default broker.minId
---
 charts/prerequisites/Chart.yaml  |  4 ++--
 charts/prerequisites/values.yaml | 41 ++++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/charts/prerequisites/Chart.yaml b/charts/prerequisites/Chart.yaml
index 745907f44..74fcf27e1 100644
--- a/charts/prerequisites/Chart.yaml
+++ b/charts/prerequisites/Chart.yaml
@@ -4,7 +4,7 @@ description: A Helm chart for packages that Datahub depends on
 type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.1.7
+version: 0.1.8
 dependencies:
   - name: elasticsearch
     version: 7.17.3
@@ -35,7 +35,7 @@ dependencies:
     condition: cp-helm-charts.enabled
   # This chart deploys a community version of kafka
   - name: kafka
-    version: 22.1.6
+    version: 26.11.2
     repository: https://raw.githubusercontent.com/bitnami/charts/archive-full-index/bitnami
     condition: kafka.enabled
 maintainers:
diff --git a/charts/prerequisites/values.yaml b/charts/prerequisites/values.yaml
index 088b79e98..26c296f69 100644
--- a/charts/prerequisites/values.yaml
+++ b/charts/prerequisites/values.yaml
@@ -1,7 +1,8 @@
 # Default configuration for pre-requisites to get you started
 # Copy this file and update to the configuration of choice
 elasticsearch:
-  enabled: true   # set this to false, if you want to provide your own ES instance.
+  # set this to false, if you want to provide your own ES instance.
+  enabled: true
 
   # If you're running in production, set this to 3 and comment out antiAffinity below
   # Or alternatively if you're running production, bring your own ElasticSearch
@@ -103,13 +104,13 @@ gcloud-sqlproxy:
     # use port 3306 for MySQL, or other port you set for your SQL instance.
     instances:
       # GCP Cloud SQL instance id
-    - instance: ""
-      # GCP project where the instance exists.
-      project: ""
-      # GCP region where the instance exists.
-      region: ""
-      # Port number for the proxy to expose for this instance.
-      port: 3306
+      - instance: ""
+        # GCP project where the instance exists.
+        project: ""
+        # GCP region where the instance exists.
+        region: ""
+        # Port number for the proxy to expose for this instance.
+        port: 3306
 
 cp-helm-charts:
   enabled: false
@@ -117,7 +118,8 @@ cp-helm-charts:
   cp-schema-registry:
     enabled: false
     kafka:
-      bootstrapServers: "prerequisites-kafka:9092"  # <<release-name>>-kafka:9092
+      # <<release-name>>-kafka:9092
+      bootstrapServers: "prerequisites-kafka:9092"
   cp-kafka:
     enabled: false
   cp-zookeeper:
@@ -134,7 +136,26 @@ cp-helm-charts:
 # Bitnami version of Kafka that deploys open source Kafka https://artifacthub.io/packages/helm/bitnami/kafka
 kafka:
   enabled: true
-  maxMessageBytes: "5242880"
+  listeners:
+    client:
+      protocol: PLAINTEXT
+    interbroker:
+      protocol: PLAINTEXT
+  controller:
+    replicaCount: 0
+  broker:
+    replicaCount: 1
+    # The new minId for broker is 100. If we don't override this, the broker will have id 100
+    # and cannot load the partitions. So we set minId to 0 to be backwards compatible
+    minId: 0
+    # These server properties are no longer exposed as parameters in the bitnami kafka chart since 24.0.0
+    # They need to be passed in through extraConfig. See below for reference
+    # https://github.com/bitnami/charts/tree/main/bitnami/kafka#to-2400
+    extraConfig: |
+      message.max.bytes=5242880
+      default.replication.factor=1
+      offsets.topic.replication.factor=1
+      transaction.state.log.replication.factor=1
   kraft:
     enabled: false
   zookeeper: