From a0de86f3270d9e3cbe220dc5adb142b65d331858 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 4 Mar 2022 09:31:33 +0100 Subject: [PATCH 1/5] chore: refine boot message on missing dynlibs --- bin/emqx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/emqx b/bin/emqx index a2a488474..f5eb8ade1 100755 --- a/bin/emqx +++ b/bin/emqx @@ -47,7 +47,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 rpc/deb package installation is recommended!" fi ## backward compatible From 1a02e606401f38ca059ba87965f1befe6d024b4e Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Fri, 4 Mar 2022 13:52:11 +0100 Subject: [PATCH 2/5] docs: fix message typo in bin/emqx --- bin/emqx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/emqx b/bin/emqx index f5eb8ade1..19c154d0d 100755 --- a/bin/emqx +++ b/bin/emqx @@ -49,7 +49,7 @@ if ! check_eralng_start >/dev/null 2>&1; then fi echoerr "There seem to be missing dynamic libs from the OS." echoerr "Using libs from ${DYNLIBS_DIR} instead." - echoerr "NOTE: EMQX's rpc/deb package installation is recommended!" + echoerr "NOTE: EMQX's rpm or deb package installation is recommended!" fi ## backward compatible From c6660084f86c7c2ab24887626ff61c2320aa4891 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Sat, 5 Mar 2022 09:35:17 +0100 Subject: [PATCH 3/5] build: one place for dashboard version --- Makefile | 1 - scripts/get-dashboard.sh | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bc37d2db..e078b9c4e 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,6 @@ export EMQX_RELUP ?= true export EMQX_DEFAULT_BUILDER = emqx/build-env:erl23.2.7.2-emqx-3-alpine export EMQX_DEFAULT_RUNNER = alpine:3.12 export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) -export EMQX_CE_DASHBOARD_VERSION ?= v4.3.5 export DOCKERFILE := deploy/docker/Dockerfile ifeq ($(OS),Windows_NT) export REBAR_COLOR=none diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh index d74b74d0c..39dd4c7d5 100755 --- a/scripts/get-dashboard.sh +++ b/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 From 7ba3d32bac8a60ce5c18b9cf5b4cf9f8d7b7d3ac Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Sat, 5 Mar 2022 09:38:31 +0100 Subject: [PATCH 4/5] ci: remove git-token file since EE dashboard is opensource now --- .github/workflows/build_packages.yaml | 1 - .github/workflows/build_slim_packages.yaml | 2 -- .github/workflows/run_automate_tests.yaml | 1 - .github/workflows/run_fvt_tests.yaml | 3 --- 4 files changed, 7 deletions(-) diff --git a/.github/workflows/build_packages.yaml b/.github/workflows/build_packages.yaml index 35d7ce640..bf70f7546 100644 --- a/.github/workflows/build_packages.yaml +++ b/.github/workflows/build_packages.yaml @@ -48,7 +48,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 diff --git a/.github/workflows/build_slim_packages.yaml b/.github/workflows/build_slim_packages.yaml index 15cab2842..a10e72258 100644 --- a/.github/workflows/build_slim_packages.yaml +++ b/.github/workflows/build_slim_packages.yaml @@ -25,7 +25,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 @@ -63,7 +62,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 diff --git a/.github/workflows/run_automate_tests.yaml b/.github/workflows/run_automate_tests.yaml index 99a8dd55c..215d983a7 100644 --- a/.github/workflows/run_automate_tests.yaml +++ b/.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 make emqx-ee-docker diff --git a/.github/workflows/run_fvt_tests.yaml b/.github/workflows/run_fvt_tests.yaml index f8f03aabb..1eb189720 100644 --- a/.github/workflows/run_fvt_tests.yaml +++ b/.github/workflows/run_fvt_tests.yaml @@ -22,7 +22,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 echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV echo "EMQX_TAG=$(./pkg-vsn.sh)" >> $GITHUB_ENV @@ -76,7 +75,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 echo "TARGET=emqx/emqx-ee" >> $GITHUB_ENV make emqx-ee-docker @@ -245,7 +243,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 From 27be2197c0e4b960af990a3e67217455d401c7b2 Mon Sep 17 00:00:00 2001 From: "ahmad.mohammadi" Date: Mon, 28 Feb 2022 11:45:18 +0330 Subject: [PATCH 5/5] fix(helm): fix unclosed action issue --- deploy/charts/emqx/templates/StatefulSet.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/charts/emqx/templates/StatefulSet.yaml b/deploy/charts/emqx/templates/StatefulSet.yaml index 73ce5ef77..d593cefb9 100644 --- a/deploy/charts/emqx/templates/StatefulSet.yaml +++ b/deploy/charts/emqx/templates/StatefulSet.yaml @@ -1,8 +1,8 @@ -{{ $configData := printf "%s\n%s\n%s\n%s" - (include (print $.Template.BasePath "/configmap.env.yaml") .) - (include (print $.Template.BasePath "/configmap.acl.yaml") .) - (include (print $.Template.BasePath "/configmap.loadedPlugins.yaml") .) - (include (print $.Template.BasePath "/configmap.loadedModules.yaml") .) }} +{{ $cfgEnv := printf "%s" (include (print $.Template.BasePath "/configmap.env.yaml") .) }} +{{ $cfgAcl := printf "%s" (include (print $.Template.BasePath "/configmap.acl.yaml") .) }} +{{ $cfgPlugins := printf "%s" (include (print $.Template.BasePath "/configmap.loadedPlugins.yaml") .) }} +{{ $cfgModules := printf "%s" (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) }}