yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11816 from qzhuyan/fix/william/genrpc-tcp-port-align 

fix: gen_rpc tcp client port align with server port
This commit is contained in:
William Yang 2023-10-25 14:19:56 +02:00 committed by GitHub
parent 37dd44c3d7 f52b4a9e32
commit ae49750b3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/run_helm_tests.yaml vendored
View File

@ -89,7 +89,6 @@ jobs:
EMQX_RPC__CACERTFILE: /opt/emqx/etc/certs/cacert.pem EMQX_RPC__CACERTFILE: /opt/emqx/etc/certs/cacert.pem
EMQX_RPC__CIPHERS: TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256 EMQX_RPC__CIPHERS: TLS_AES_256_GCM_SHA384,TLS_AES_128_GCM_SHA256
EMQX_RPC__TLS_VERSIONS: "[tlsv1.2]" EMQX_RPC__TLS_VERSIONS: "[tlsv1.2]"
EMQX_RPC__PORT_DISCOVERY: manual
EOL EOL
- name: run emqx on chart (k8s) - name: run emqx on chart (k8s)
if: matrix.discovery == 'k8s' if: matrix.discovery == 'k8s'

4
apps/emqx_conf/src/emqx_conf_schema.erl
View File

@ -1151,6 +1151,7 @@ translation("emqx") ->
translation("gen_rpc") -> translation("gen_rpc") ->
[ [
{"default_client_driver", fun tr_gen_rpc_default_client_driver/1}, {"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_port", fun tr_gen_rpc_ssl_client_port/1},
{"ssl_client_options", fun tr_gen_rpc_ssl_options/1}, {"ssl_client_options", fun tr_gen_rpc_ssl_options/1},
{"ssl_server_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) -> tr_gen_rpc_default_client_driver(Conf) ->
conf_get("rpc.protocol", 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) -> tr_gen_rpc_ssl_client_port(Conf) ->
conf_get("rpc.ssl_server_port", Conf). conf_get("rpc.ssl_server_port", Conf).

2
deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
View File

@ -123,8 +123,6 @@ spec:
containerPort: 4370 containerPort: 4370
- name: genrpc-manual - name: genrpc-manual
containerPort: 5369 containerPort: 5369
- name: genrpc2-auto
containerPort: 5370
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "emqx.fullname" . }}-env name: {{ include "emqx.fullname" . }}-env

2
deploy/charts/emqx/templates/StatefulSet.yaml
View File

@ -123,8 +123,6 @@ spec:
containerPort: 4370 containerPort: 4370
- name: genrpc-manual - name: genrpc-manual
containerPort: 5369 containerPort: 5369
- name: genrpc2-auto
containerPort: 5370
envFrom: envFrom:
- configMapRef: - configMapRef:
name: {{ include "emqx.fullname" . }}-env name: {{ include "emqx.fullname" . }}-env