Jaeger bump kafka common dependency (#525)

* [jaeger] Bumping kafka chart dependency from 19.x to 26.x & common from 1.16.x to 2.x Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> * [jaeger] Bumping kafka chart dependency from 19.x to 26.x & common from 1.16.x to 2.x Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> * [jaeger] Bumping kafka chart dependency from 19.x to 26.x & common from 1.16.x to 2.x Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> * [jaeger] Bumping kafka chart dependency from 19.x to 26.x & common from 1.16.x to 2.x Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> * [jaeger] Bumping kafka chart dependency from 19.x to 26.x & common from 1.16.x to 2.x Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> * Update Readme and Kafka Version Signed-off-by: dperic <[email protected]> * Fix readme and sign Signed-off-by: dperic <[email protected]> * Bumping Chart Version to 1.0.0 due to breaking change Signed-off-by: dperic <[email protected]> * Remove trailing space Signed-off-by: dpaxon <[email protected]> --------- Signed-off-by: Dan Peric <[email protected]> Signed-off-by: dperic <[email protected]> Signed-off-by: dpaxon <[email protected]>
jaegertracing · Feb 5, 2024 · 29af76b · 29af76b
1 parent 94950b7
commit 29af76b
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 13 deletions.
diff --git a/charts/jaeger/Chart.lock b/charts/jaeger/Chart.lock
@@ -7,9 +7,9 @@ dependencies:
   version: 7.17.3
 - name: kafka
   repository: https://charts.bitnami.com/bitnami
-  version: 19.1.5
+  version: 26.6.2
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.16.0
-digest: sha256:60d70b3966a1bb5b87d6679139138b5a79871c486a771953d527e083ea44d9df
-generated: "2023-11-02T23:56:44.246203-04:00"
+  version: 2.14.1
+digest: sha256:3c95910df1461e41daaa77958b63b7739c5291468ffbffd702dcc7550b5cf117
+generated: "2024-01-09T14:23:43.089557-05:00"
diff --git a/charts/jaeger/Chart.yaml b/charts/jaeger/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.53.0
 description: A Jaeger Helm chart for Kubernetes
 name: jaeger
 type: application
-version: 0.74.1
+version: 1.0.0
 # CronJobs require v1.21
 kubeVersion: ">= 1.21-0"
 keywords:
@@ -36,9 +36,9 @@ dependencies:
     repository: https://helm.elastic.co
     condition: provisionDataStore.elasticsearch
   - name: kafka
-    version: ^19.1.5
+    version: ^26.6.2
     repository: https://charts.bitnami.com/bitnami
     condition: provisionDataStore.kafka
   - name: common
     repository: https://charts.bitnami.com/bitnami
-    version: 1.16.0
+    version: 2.x.x
diff --git a/charts/jaeger/README.md b/charts/jaeger/README.md
@@ -433,3 +433,17 @@ hotrod:
     - name: OTEL_EXPORTER_OTLP_ENDPOINT
       value: http://my-otel-collector-opentelemetry-collector:4318
 ```
+
+## Updating to Kafka to Kraft Mode
+
+In the Kafka Helm Chart version 24.0.0 major refactors were done to support Kraft mode. More information can be found [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#to-2400).
+
+#### Upgrading from Kraft mode
+
+If you are upgrading from Kraft mode, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode).
+
+#### Upgrading from Zookeeper mode
+
+If you are upgrading from Zookeeper mode, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode).
+
+After you complete the steps above, follow the instructions [here](https://github.com/bitnami/charts/tree/main/bitnami/kafka#migrating-from-zookeeper-early-access) to finally migrate from Zookeeper.
diff --git a/charts/jaeger/values.yaml b/charts/jaeger/values.yaml
@@ -176,12 +176,27 @@ cassandra:
 
 # Begin: Override values on the Kafka subchart to customize for Jaeger
 kafka:
-  replicaCount: 1
-  autoCreateTopicsEnable: true
-  zookeeper:
-    replicaCount: 1
-    serviceAccount:
-      create: true
+  listeners:
+    client:
+      protocol: PLAINTEXT
+    controller:
+      protocol: PLAINTEXT
+    interbroker:
+      protocol: PLAINTEXT
+    external:
+      protocol: PLAINTEXT
+  controller:
+    replicaCount: 3
+    extraConfig: |
+      auto.create.topics.enable=true
+# Zookeeper has been deprecated by Kafka in favor of Kraft Mode: https://developer.confluent.io/learn/kraft/
+# Documentation for upgrading Kafka and keeping Zookeeper: https://github.com/bitnami/charts/tree/main/bitnami/kafka#upgrading-from-zookeeper-mode
+# Documentation for migrating away from Zookeeper to Kraft Mode: https://github.com/bitnami/charts/tree/main/bitnami/kafka#migrating-from-zookeeper-early-access
+  # zookeeper:
+  #   enabled: false
+  #   replicaCount: 1
+  #   serviceAccount:
+  #     create: true
 
 # End: Override values on the Kafka subchart to customize for Jaeger