William Yang 2 лет назад
Родитель
Сommit
2a7d73e62c

+ 4 - 0
.github/workflows/run_helm_tests.yaml

@@ -76,6 +76,8 @@ 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.3]"
           EMQX_RPC__TLS_VERSIONS: "[tlsv1.3]"
+          EMQX_RPC__SSL_SERVER_PRT: 5370
+          EMQX_RPC__PORT_DISCOVERY: manual
         EOL
         EOL
     - name: Prepare emqxConfig.EMQX_RPC using ssl1.2
     - name: Prepare emqxConfig.EMQX_RPC using ssl1.2
       working-directory: source
       working-directory: source
@@ -89,6 +91,8 @@ 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__SSL_SERVER_PRT: 5370
+          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 - 0
deploy/charts/emqx-enterprise/templates/StatefulSet.yaml

@@ -121,6 +121,10 @@ spec:
           {{- end }}
           {{- end }}
           - name: ekka
           - name: ekka
             containerPort: 4370
             containerPort: 4370
+          - name: genrpc
+            containerPort: 5369
+          - name: genrpc-ssl
+            containerPort: 5370
           envFrom:
           envFrom:
             - configMapRef:
             - configMapRef:
                 name: {{ include "emqx.fullname" . }}-env
                 name: {{ include "emqx.fullname" . }}-env

+ 4 - 0
deploy/charts/emqx/templates/StatefulSet.yaml

@@ -121,6 +121,10 @@ spec:
           {{- end }}
           {{- end }}
           - name: ekka
           - name: ekka
             containerPort: 4370
             containerPort: 4370
+          - name: genrpc
+            containerPort: 5369
+          - name: genrpc-ssl
+            containerPort: 5370
           envFrom:
           envFrom:
             - configMapRef:
             - configMapRef:
                 name: {{ include "emqx.fullname" . }}-env
                 name: {{ include "emqx.fullname" . }}-env