From 302f761badf3211c702506f8eab42835fc1f61a7 Mon Sep 17 00:00:00 2001
From: Gezi-lzq <lzqtxwd@gmail.com>
Date: Fri, 3 Apr 2026 18:06:45 +0800
Subject: [PATCH] refactor(devkit): simplify host port mappings and remove
 unused PLAINTEXT/CONTROLLER exports

Remove unused PLAINTEXT and CONTROLLER host port mappings since they are
unreachable from the host (advertised.listeners uses container hostnames).
Reuse the X9092 port slots for HOST listener and change the container-side
HOST port from 29092 to 9192 to avoid confusing collision with node-2.
---
 devkit/config/role/broker.properties |  2 +-
 devkit/config/role/server.properties |  2 +-
 devkit/docker-compose.yml            | 20 +++++---------------
 devkit/justfile                      |  2 +-
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/devkit/config/role/broker.properties b/devkit/config/role/broker.properties
index a2ee93943b..781d7f2fd9 100644
--- a/devkit/config/role/broker.properties
+++ b/devkit/config/role/broker.properties
@@ -3,5 +3,5 @@
 # Variable: ${NODE_ID} is replaced by generate-config
 
 process.roles=broker
-listeners=PLAINTEXT://:9092,HOST://:29092
+listeners=PLAINTEXT://:9092,HOST://:9192
 advertised.listeners=PLAINTEXT://node-${NODE_ID}:9092,HOST://localhost:${HOST_PORT}
diff --git a/devkit/config/role/server.properties b/devkit/config/role/server.properties
index 464e50498b..ca6bf39e4d 100644
--- a/devkit/config/role/server.properties
+++ b/devkit/config/role/server.properties
@@ -3,5 +3,5 @@
 # Variable: ${NODE_ID} is replaced by generate-config
 
 process.roles=broker,controller
-listeners=PLAINTEXT://:9092,CONTROLLER://:9093,HOST://:29092
+listeners=PLAINTEXT://:9092,CONTROLLER://:9093,HOST://:9192
 advertised.listeners=PLAINTEXT://node-${NODE_ID}:9092,CONTROLLER://node-${NODE_ID}:9093,HOST://localhost:${HOST_PORT}
diff --git a/devkit/docker-compose.yml b/devkit/docker-compose.yml
index 4b55a0e099..74e18699cc 100644
--- a/devkit/docker-compose.yml
+++ b/devkit/docker-compose.yml
@@ -73,9 +73,7 @@ services:
     hostname: node-0
     profiles: [single, cluster, cluster4, cluster5]
     ports:
-      - "9092:9092"
-      - "9093:9093"
-      - "9192:29092"
+      - "9092:9192"
       - "5005:5005"
       - "9999:9999"
     command:
@@ -94,9 +92,7 @@ services:
     hostname: node-1
     profiles: [cluster, cluster4, cluster5]
     ports:
-      - "19092:9092"
-      - "19093:9093"
-      - "19192:29092"
+      - "19092:9192"
       - "5006:5005"
     command:
       - bash
@@ -114,9 +110,7 @@ services:
     hostname: node-2
     profiles: [cluster, cluster4, cluster5]
     ports:
-      - "29092:9092"
-      - "29093:9093"
-      - "29192:29092"
+      - "29092:9192"
       - "5007:5005"
     command:
       - bash
@@ -134,9 +128,7 @@ services:
     hostname: node-3
     profiles: [cluster4, cluster5]
     ports:
-      - "39092:9092"
-      - "39093:9093"
-      - "39192:29092"
+      - "39092:9192"
       - "5008:5005"
     command:
       - bash
@@ -154,9 +146,7 @@ services:
     hostname: node-4
     profiles: [cluster5]
     ports:
-      - "49092:9092"
-      - "49093:9093"
-      - "49192:29092"
+      - "49092:9192"
       - "5009:5005"
     command:
       - bash
diff --git a/devkit/justfile b/devkit/justfile
index bf5652c116..1b3604a1b5 100644
--- a/devkit/justfile
+++ b/devkit/justfile
@@ -81,7 +81,7 @@ _render-node node ctrl_count cluster_id voters bootstrap features="":
     export VOTERS="{{voters}}"
     export BOOTSTRAP="{{bootstrap}}"
     export NODE_ID="{{node}}"
-    export HOST_PORT=$(({{node}} * 10000 + 9192))
+    export HOST_PORT=$(({{node}} * 10000 + 9092))
     export AZ_NAME="${AZS[$(({{node}} % ${#AZS[@]}))]}"
 
     render() { envsubst < "$1" | grep -v '^#' | grep -v '^$'; }