From f52b4a9e32ec917813f7e1784e02755e118afd05 Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Wed, 25 Oct 2023 12:04:21 +0200
Subject: [PATCH] fix: gen_rpc tcp client port align with server port

---
 .github/workflows/run_helm_tests.yaml                    | 1 -
 apps/emqx_conf/src/emqx_conf_schema.erl                  | 4 ++++
 deploy/charts/emqx-enterprise/templates/StatefulSet.yaml | 2 --
 deploy/charts/emqx/templates/StatefulSet.yaml            | 2 --
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run_helm_tests.yaml b/.github/workflows/run_helm_tests.yaml
index bc4a7245f..5fc215f02 100644
--- a/.github/workflows/run_helm_tests.yaml
+++ b/.github/workflows/run_helm_tests.yaml
@@ -89,7 +89,6 @@ jobs:
           EMQX_RPC__CACERTFILE: /opt/emqx/etc/certs/cacert.pem
           EMQX_RPC__CIPHERS: TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256
           EMQX_RPC__TLS_VERSIONS: "[tlsv1.2]"
-          EMQX_RPC__PORT_DISCOVERY: manual
         EOL
     - name: run emqx on chart (k8s)
       if: matrix.discovery == 'k8s'
diff --git a/apps/emqx_conf/src/emqx_conf_schema.erl b/apps/emqx_conf/src/emqx_conf_schema.erl
index e65b9bebd..4eab257b8 100644
--- a/apps/emqx_conf/src/emqx_conf_schema.erl
+++ b/apps/emqx_conf/src/emqx_conf_schema.erl
@@ -1151,6 +1151,7 @@ translation("emqx") ->
 translation("gen_rpc") ->
     [
         {"default_client_driver", fun tr_gen_rpc_default_client_driver/1},
+        {"tcp_client_port", fun tr_gen_rpc_tcp_client_port/1},
         {"ssl_client_port", fun tr_gen_rpc_ssl_client_port/1},
         {"ssl_client_options", fun tr_gen_rpc_ssl_options/1},
         {"ssl_server_options", fun tr_gen_rpc_ssl_options/1},
@@ -1227,6 +1228,9 @@ collector_enabled(disabled, _) -> [].
 tr_gen_rpc_default_client_driver(Conf) ->
     conf_get("rpc.protocol", Conf).
 
+tr_gen_rpc_tcp_client_port(Conf) ->
+    conf_get("rpc.tcp_server_port", Conf).
+
 tr_gen_rpc_ssl_client_port(Conf) ->
     conf_get("rpc.ssl_server_port", Conf).
 
diff --git a/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml b/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
index 0e2e90fd8..a70b6d168 100644
--- a/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
@@ -123,8 +123,6 @@ spec:
             containerPort: 4370
           - name: genrpc-manual
             containerPort: 5369
-          - name: genrpc2-auto
-            containerPort: 5370
           envFrom:
             - configMapRef:
                 name: {{ include "emqx.fullname" . }}-env
diff --git a/deploy/charts/emqx/templates/StatefulSet.yaml b/deploy/charts/emqx/templates/StatefulSet.yaml
index 9ec19cbf3..624f0f2ab 100644
--- a/deploy/charts/emqx/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx/templates/StatefulSet.yaml
@@ -123,8 +123,6 @@ spec:
             containerPort: 4370
           - name: genrpc-manual
             containerPort: 5369
-          - name: genrpc2-auto
-            containerPort: 5370
           envFrom:
             - configMapRef:
                 name: {{ include "emqx.fullname" . }}-env