From cbd65c9270a7b29190c70d1987f8966d128e72af Mon Sep 17 00:00:00 2001 From: DingGGu Date: Fri, 4 Nov 2022 17:44:47 +0900 Subject: [PATCH] [bitnami/kafka] Add support set config broker.rack with AWS availability zone info (#13308) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support set config broker.rack with AWS availability zone info Signed-off-by: DingGGu * Remove default brokerRackAssignment value Signed-off-by: DingGGu * Update README.md with readme-generator-for-helm Signed-off-by: Bitnami Containers * doc: Add missing padding in README.md Signed-off-by: DingGGu * Provide broker rack information to same way with MSK Signed-off-by: DingGGu Signed-off-by: DingGGu Signed-off-by: Bitnami Containers Signed-off-by: Carlos Rodríguez Hernández Co-authored-by: Bitnami Containers Co-authored-by: Carlos Rodríguez Hernández --- bitnami/kafka/Chart.yaml | 2 +- bitnami/kafka/README.md | 1 + bitnami/kafka/templates/scripts-configmap.yaml | 4 ++++ bitnami/kafka/values.yaml | 4 ++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml index 935a5254d1..26c28771da 100644 --- a/bitnami/kafka/Chart.yaml +++ b/bitnami/kafka/Chart.yaml @@ -29,4 +29,4 @@ name: kafka sources: - https://github.com/bitnami/containers/tree/main/bitnami/kafka - https://kafka.apache.org/ -version: 19.0.2 +version: 19.1.0 diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md index 5c5c691f42..4624e5f495 100644 --- a/bitnami/kafka/README.md +++ b/bitnami/kafka/README.md @@ -168,6 +168,7 @@ The command removes all the Kubernetes components associated with the chart and | --------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------- | | `replicaCount` | Number of Kafka nodes | `1` | | `minBrokerId` | Minimal broker.id value, nodes increment their `broker.id` respectively | `0` | +| `brokerRackAssignment` | Set Broker Assignment for multi tenant environment Allowed values: `aws-az` | `""` | | `containerPorts.client` | Kafka client container port | `9092` | | `containerPorts.internal` | Kafka inter-broker container port | `9093` | | `containerPorts.external` | Kafka external container port | `9094` | diff --git a/bitnami/kafka/templates/scripts-configmap.yaml b/bitnami/kafka/templates/scripts-configmap.yaml index df780422eb..57e1250538 100644 --- a/bitnami/kafka/templates/scripts-configmap.yaml +++ b/bitnami/kafka/templates/scripts-configmap.yaml @@ -82,6 +82,10 @@ data: export KAFKA_CFG_BROKER_ID="$((ID + {{ .Values.minBrokerId }}))" fi + {{- if eq .Values.brokerRackAssignment "aws-az" }} + export KAFKA_CFG_BROKER_RACK=$(curl "http://169.254.169.254/latest/meta-data/placement/availability-zone-id") + {{- end }} + {{- if .Values.externalAccess.enabled }} # Configure external ip and port {{- if eq .Values.externalAccess.service.type "LoadBalancer" }} diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml index a58a6d06f1..ab29d86828 100644 --- a/bitnami/kafka/values.yaml +++ b/bitnami/kafka/values.yaml @@ -429,6 +429,10 @@ replicaCount: 1 ## E.g., with `minBrokerId=100` and 3 nodes, IDs will be 100, 101, 102 for brokers 0, 1, and 2, respectively. ## minBrokerId: 0 +## @param brokerRackAssignment Set Broker Assignment for multi tenant environment Allowed values: `aws-az` +## ref: https://cwiki.apache.org/confluence/display/KAFKA/KIP-392%3A+Allow+consumers+to+fetch+from+closest+replica +## +brokerRackAssignment: "" ## @param containerPorts.client Kafka client container port ## @param containerPorts.internal Kafka inter-broker container port ## @param containerPorts.external Kafka external container port