chore: access Kafka brokers from outside the k8s cluster (#5811) (#14)

apecloud · Nov 14, 2023 · 4d1d60d · 4d1d60d
1 parent b21facb
commit 4d1d60d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
diff --git a/addons/kafka/configs/kafka-server-constraint.cue b/addons/kafka/configs/kafka-server-constraint.cue
@@ -665,3 +665,6 @@
 	// other parameters
 	...
 }
+
+configuration: #KafkaParameter & {
+}
diff --git a/addons/kafka/scripts/kafka-server-setup.sh.tpl b/addons/kafka/scripts/kafka-server-setup.sh.tpl
@@ -110,6 +110,17 @@ if [[ -n "$KB_KAFKA_BROKER_HEAP" ]]; then
   echo "[jvm][KB_KAFKA_BROKER_HEAP]export KAFKA_HEAP_OPTS=${KB_KAFKA_BROKER_HEAP}"
 fi
 
+# for support access Kafka brokers from outside the k8s cluster
+if [[ -n "$KAFKA_CFG_K8S_NODEPORT" ]];then
+  if [[ "broker,controller" = "$KAFKA_CFG_PROCESS_ROLES" ]] || [[ "broker" = "$KAFKA_CFG_PROCESS_ROLES" ]]; then
+    export KAFKA_CFG_ADVERTISED_LISTENERS="PLAINTEXT://${KB_HOST_IP}:${KAFKA_CFG_K8S_NODEPORT}"
+    echo "[cfg]KAFKA_CFG_ADVERTISED_LISTENERS=$KAFKA_CFG_ADVERTISED_LISTENERS"
+    echo "[cfg]KAFKA_CFG_LISTENERS=$KAFKA_CFG_LISTENERS"
+    echo "[cfg]KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP=$KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP"
+    echo "[cfg]KAFKA_CFG_INTER_BROKER_LISTENER_NAME=$KAFKA_CFG_INTER_BROKER_LISTENER_NAME"
+  fi
+fi
+
 # cfg setting
 if [[ "broker,controller" = "$KAFKA_CFG_PROCESS_ROLES" ]] || [[ "broker" = "$KAFKA_CFG_PROCESS_ROLES" ]]; then
     # deleting this information can reacquire the controller members when the broker restarts,

diff --git a/addons/kafka/templates/clusterdefinition.yaml b/addons/kafka/templates/clusterdefinition.yaml
@@ -42,7 +42,7 @@ spec:
           templateRef: {{ include "kafka.name" . }}-configuration-tpl
           volumeName: kafka-config
           namespace: {{ .Release.Namespace }}
-        - name: kafka-jmx-configuration-tpl
+        - name: {{ include "kafka.name" . }}-jmx-configuration-tpl
           templateRef: {{ include "kafka.name" . }}-jmx-configuration-tpl
           volumeName: jmx-config
           namespace: {{ .Release.Namespace }}

diff --git a/addons/kafka/values.yaml b/addons/kafka/values.yaml
@@ -31,6 +31,8 @@ images:
 ##
 debugEnabled: true
 
+commonAnnotations: {}
+
 kafkaBroker:
   minNodeId: 100
-Original file line number
+Diff line change
@@ Expand Up / @@ -665,3 +665,6 @@ @@
     	// other parameters
     	...
     }
+    configuration: #KafkaParameter & {
+    }