From 2a7d73e62ccbc3af25098f7e57bd5d8ab53e2c1e Mon Sep 17 00:00:00 2001
From: William Yang <mscame@gmail.com>
Date: Tue, 24 Oct 2023 21:19:37 +0200
Subject: [PATCH] ci: fix helm chart test

---
 .github/workflows/run_helm_tests.yaml                    | 4 ++++
 deploy/charts/emqx-enterprise/templates/StatefulSet.yaml | 4 ++++
 deploy/charts/emqx/templates/StatefulSet.yaml            | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/.github/workflows/run_helm_tests.yaml b/.github/workflows/run_helm_tests.yaml
index 5fc215f02..d449ea54d 100644
--- a/.github/workflows/run_helm_tests.yaml
+++ b/.github/workflows/run_helm_tests.yaml
@@ -76,6 +76,8 @@ 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.3]"
+          EMQX_RPC__SSL_SERVER_PRT: 5370
+          EMQX_RPC__PORT_DISCOVERY: manual
         EOL
     - name: Prepare emqxConfig.EMQX_RPC using ssl1.2
       working-directory: source
@@ -89,6 +91,8 @@ 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__SSL_SERVER_PRT: 5370
+          EMQX_RPC__PORT_DISCOVERY: manual
         EOL
     - name: run emqx on chart (k8s)
       if: matrix.discovery == 'k8s'
diff --git a/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml b/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
index 7f909cc79..d884015b7 100644
--- a/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx-enterprise/templates/StatefulSet.yaml
@@ -121,6 +121,10 @@ spec:
           {{- end }}
           - name: ekka
             containerPort: 4370
+          - name: genrpc
+            containerPort: 5369
+          - name: genrpc-ssl
+            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 430260585..d14a78092 100644
--- a/deploy/charts/emqx/templates/StatefulSet.yaml
+++ b/deploy/charts/emqx/templates/StatefulSet.yaml
@@ -121,6 +121,10 @@ spec:
           {{- end }}
           - name: ekka
             containerPort: 4370
+          - name: genrpc
+            containerPort: 5369
+          - name: genrpc-ssl
+            containerPort: 5370
           envFrom:
             - configMapRef:
                 name: {{ include "emqx.fullname" . }}-env