Merge remote-tracking branch 'origin/main-v4.3' into main-v4.4

.github/workflows/build_packages.yaml

@@ -49,7 +49,6 @@ jobs:
         run: |
           echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> source/scripts/git-token
           make -C source deps-all
           zip -ryq source.zip source/* source/.[^.]*
       - uses: actions/upload-artifact@v2

.github/workflows/build_slim_packages.yaml

@@ -32,7 +32,6 @@ jobs:
         if make emqx-ee --dry-run > /dev/null 2>&1; then
           echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
           echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
         else
           echo "EMQX_NAME=emqx" >> $GITHUB_ENV
@@ -111,7 +110,6 @@ jobs:
         if make emqx-ee --dry-run > /dev/null 2>&1; then
           echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> ./scripts/git-token
           echo "EMQX_NAME=emqx-ee" >> $GITHUB_ENV
         else
           echo "EMQX_NAME=emqx" >> $GITHUB_ENV

.github/workflows/run_automate_tests.yaml

@@ -33,7 +33,6 @@ jobs:
         if [ -f EMQX_ENTERPRISE ]; then
           echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
           git config --global credential.helper store
-          echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
           make deps-emqx-ee
           make clean
           echo "::set-output name=imgname::emqx-ee"

.github/workflows/run_fvt_tests.yaml

@@ -18,7 +18,6 @@ jobs:
             if make emqx-ee --dry-run > /dev/null 2>&1; then
               echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
-              echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
               make deps-emqx-ee
               make clean
               echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV
@@ -81,7 +80,6 @@ jobs:
             if make emqx-ee --dry-run > /dev/null 2>&1; then
               echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
-              echo "${{ secrets.CI_GIT_TOKEN }}" >> scripts/git-token
               make deps-emqx-ee
               make clean
               echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV
@@ -296,7 +294,6 @@ jobs:
             if [ "$PROFILE" = "emqx-ee" ]; then
               echo "https://ci%40emqx.io:${{ secrets.CI_GIT_TOKEN }}@github.com" > $HOME/.git-credentials
               git config --global credential.helper store
-              echo "${{ secrets.CI_GIT_TOKEN }}" >> emqx/scripts/git-token
             fi
         - name: Build emqx
           run: make -C emqx ${PROFILE}-zip

Makefile

@@ -7,7 +7,6 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/4.4-5:24.1.5-3-alpine3.1
 export EMQX_DEFAULT_RUNNER = alpine:3.14
 export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh)
 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
-export EMQX_CE_DASHBOARD_VERSION ?= v4.4.0
 export DOCKERFILE := deploy/docker/Dockerfile
 export DOCKERFILE_TESTING := deploy/docker/Dockerfile.testing
 ifeq ($(OS),Windows_NT)

bin/emqx

@@ -52,7 +52,9 @@ if ! check_eralng_start >/dev/null 2>&1; then
         echoerr "this EMQX release is built for $BUILT_ON"
         exit 1
     fi
-    echoerr "WARNING: There seem to be missing dynamic libs from the OS. Using libs from ${DYNLIBS_DIR}"
+    echoerr "There seem to be missing dynamic libs from the OS."
+    echoerr "Using libs from ${DYNLIBS_DIR} instead."
+    echoerr "NOTE: EMQX's rpm or deb package installation is recommended!"
 fi
 
 ## backward compatible

deploy/charts/emqx/templates/StatefulSet.yaml

@@ -1,8 +1,8 @@
-{{ $configData := printf "%s\n%s\n%s\n%s"
+{{ $cfgEnv := printf "%s"  (include (print $.Template.BasePath "/configmap.env.yaml") .) }}
-  (include (print $.Template.BasePath "/configmap.env.yaml") .)
+{{ $cfgAcl := printf "%s"  (include (print $.Template.BasePath "/configmap.acl.yaml") .) }}
-  (include (print $.Template.BasePath "/configmap.acl.yaml") .)
+{{ $cfgPlugins := printf "%s" (include (print $.Template.BasePath "/configmap.loadedPlugins.yaml") .) }}
-  (include (print $.Template.BasePath "/configmap.loadedPlugins.yaml") .)
+{{ $cfgModules := printf "%s"  (include (print $.Template.BasePath "/configmap.loadedModules.yaml") .) }}
-  (include (print $.Template.BasePath "/configmap.loadedModules.yaml") .) }}
+{{ $configData := printf "%s\n%s\n%s\n%s" $cfgEnv $cfgAcl $cfgPlugins $cfgModules}}
   ## Compatible with previous misspellings
 {{ $licenseSecretName := coalesce .Values.emqxLicenseSecretName .Values.emqxLicneseSecretName }}
 {{ $image := printf "%s:%s" .Values.image.repository (default .Values.image.tag .Chart.AppVersion) }}

scripts/get-dashboard.sh

@@ -5,6 +5,18 @@ set -euo pipefail
 # ensure dir
 cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
 
+PKG_VSN="${PKG_VSN:-$(./pkg-vsn.sh)}"
+case "${PKG_VSN}" in
+    4.3*)
+        EMQX_CE_DASHBOARD_VERSION='v4.3.5'
+        EMQX_EE_DASHBOARD_VERSION='v4.3.15'
+        ;;
+    *)
+        echo "Unsupported version $PKG_VSN" >&2
+        exit 1
+        ;;
+esac
+
 RELEASE_ASSET_FILE="emqx-dashboard.zip"
 
 if [ -f 'EMQX_ENTERPRISE' ]; then