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

refactor(CI): update the ENVs for new listener,zone configs

This commit is contained in:
Shawn 2021-08-25 17:55:14 +08:00
parent cc56c74964
commit 092f29fecd
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/build_packages/tests.sh
View File

@ -36,9 +36,9 @@ emqx_test(){
"zip") "zip")
packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.zip) packagename=$(basename "${PACKAGE_PATH}/${EMQX_NAME}"-*.zip)
unzip -q "${PACKAGE_PATH}/${packagename}" unzip -q "${PACKAGE_PATH}/${packagename}"
export EMQX_ZONE__EXTERNAL__SERVER_KEEPALIVE=60 \ export EMQX_ZONES__DEFAULT__MQTT__SERVER_KEEPALIVE=60 \
EMQX_MQTT__MAX_TOPIC_ALIAS=10 EMQX_MQTT__MAX_TOPIC_ALIAS=10
[[ $(arch) == *arm* || $(arch) == aarch64 ]] && export EMQX_ZONES__DEFAULT__LISTENERS__MQTT_QUIC__ENABLED=false [[ $(arch) == *arm* || $(arch) == aarch64 ]] && export EMQX_LISTENERS__QUIC__DEFAULT__ENABLED=false
# sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins # sed -i '/emqx_telemetry/d' "${PACKAGE_PATH}"/emqx/data/loaded_plugins
echo "running ${packagename} start" echo "running ${packagename} start"
@ -119,7 +119,7 @@ run_test(){
if [ -f "$emqx_env_vars" ]; if [ -f "$emqx_env_vars" ];
then then
tee -a "$emqx_env_vars" <<EOF tee -a "$emqx_env_vars" <<EOF
export EMQX_ZONE__EXTERNAL__SERVER_KEEPALIVE=60 export EMQX_ZONES__DEFAULT__MQTT__SERVER_KEEPALIVE=60
export EMQX_MQTT__MAX_TOPIC_ALIAS=10 export EMQX_MQTT__MAX_TOPIC_ALIAS=10
export EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug export EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug
export EMQX_LOG__FILE_HANDLERS__DEFAULT__LEVEL=debug export EMQX_LOG__FILE_HANDLERS__DEFAULT__LEVEL=debug

4
.ci/docker-compose-file/conf.cluster.env
View File

@ -1,7 +1,7 @@
EMQX_NAME=emqx EMQX_NAME=emqx
EMQX_CLUSTER__DISCOVERY_STRATEGY=static EMQX_CLUSTER__DISCOVERY_STRATEGY=static
EMQX_CLUSTER__STATIC__SEEDS="[emqx@node1.emqx.io, emqx@node2.emqx.io]" EMQX_CLUSTER__STATIC__SEEDS="[emqx@node1.emqx.io, emqx@node2.emqx.io]"
EMQX_ZONES__DEFAULT__LISTENERS__MQTT_TCP__PROXY_PROTOCOL=true EMQX_LISTENERS__TCP__DEFAULT__PROXY_PROTOCOL=true
EMQX_ZONES__DEFAULT__LISTENERS__MQTT_WS__PROXY_PROTOCOL=true EMQX_LISTENERS__WS__DEFAULT__PROXY_PROTOCOL=true
EMQX_LOG__CONSOLE_HANDLER__ENABLE=true EMQX_LOG__CONSOLE_HANDLER__ENABLE=true
EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug EMQX_LOG__CONSOLE_HANDLER__LEVEL=debug

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

@ -91,20 +91,20 @@ spec:
{{- end }} {{- end }}
ports: ports:
- name: mqtt - name: mqtt
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__TCP__EXTERNAL | default 1883 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__TCP__DEFAULT | default 1883 }}
- name: mqttssl - name: mqttssl
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__SSL__EXTERNAL | default 8883 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__SSL__DEFAULT | default 8883 }}
- name: mgmt - name: mgmt
containerPort: {{ .Values.emqxConfig.EMQX_MANAGEMENT__LISTENER__HTTP | default 8081 }} containerPort: {{ .Values.emqxConfig.EMQX_MANAGEMENT__LISTENER__HTTP | default 8081 }}
- name: ws - name: ws
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__WS__EXTERNAL | default 8083 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WS__DEFAULT | default 8083 }}
- name: wss - name: wss
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__WSS__EXTERNAL | default 8084 }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__WSS__DEFAULT | default 8084 }}
- name: dashboard - name: dashboard
containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTP | default 18083 }} containerPort: {{ .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTP | default 18083 }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENER__TCP__INTERNAL) }} {{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__DEFAULT) }}
- name: internalmqtt - name: internalmqtt
containerPort: {{ .Values.emqxConfig.EMQX_LISTENER__TCP__INTERNAL }} containerPort: {{ .Values.emqxConfig.EMQX_LISTENERS__TCP__DEFAULT }}
{{- end }} {{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS) }} {{- if not (empty .Values.emqxConfig.EMQX_DASHBOARD__LISTENER__HTTPS) }}
- name: dashboardtls - name: dashboardtls

4
deploy/charts/emqx/templates/service.yaml
View File

@ -35,7 +35,7 @@ spec:
{{- else if eq .Values.service.type "ClusterIP" }} {{- else if eq .Values.service.type "ClusterIP" }}
nodePort: null nodePort: null
{{- end }} {{- end }}
{{- if not (empty .Values.emqxConfig.EMQX_LISTENER__TCP__INTERNAL) }} {{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__DEFAULT) }}
- name: internalmqtt - name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }} port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP protocol: TCP
@ -126,7 +126,7 @@ spec:
port: {{ .Values.service.mqtt | default 1883 }} port: {{ .Values.service.mqtt | default 1883 }}
protocol: TCP protocol: TCP
targetPort: mqtt targetPort: mqtt
{{- if not (empty .Values.emqxConfig.EMQX_LISTENER__TCP__INTERNAL) }} {{- if not (empty .Values.emqxConfig.EMQX_LISTENERS__TCP__DEFAULT) }}
- name: internalmqtt - name: internalmqtt
port: {{ .Values.service.internalmqtt | default 11883 }} port: {{ .Values.service.internalmqtt | default 11883 }}
protocol: TCP protocol: TCP

6
deploy/docker/README.md
View File

@ -48,7 +48,7 @@ You can change the prefix by overriding "HOCON_ENV_OVERRIDE_PREFIX".
Example: Example:
```bash ```bash
EMQX_ZONES__DEFAULT__LISTENERS__MQTT_SSL__ACCEPTORS <--> zones.default.listeners.mqtt_ssl.acceptors EMQX_LISTENERS__SSL__DEFAULT__ACCEPTORS <--> listeners.ssl.default.acceptors
EMQX_ZONES__DEFAULT__MQTT__MAX_PACKET_SIZE <--> zones.default.mqtt.max_packet_size EMQX_ZONES__DEFAULT__MQTT__MAX_PACKET_SIZE <--> zones.default.mqtt.max_packet_size
``` ```
@ -87,7 +87,7 @@ If set ``EMQX_NAME`` and ``EMQX_HOST``, and unset ``EMQX_NODE_NAME``, ``EMQX_NOD
For example, set mqtt tcp port to 1883 For example, set mqtt tcp port to 1883
``docker run -d --name emqx -e EMQX_ZONES__DEFAULT__LISTENERS__MQTT_TCP__BIND=1883 -p 18083:18083 -p 1883:1883 emqx/emqx:latest`` ``docker run -d --name emqx -e EMQX__LISTENERS__TCP__DEFAULT__BIND=1883 -p 18083:18083 -p 1883:1883 emqx/emqx:latest``
#### EMQ Loaded Modules Configuration #### EMQ Loaded Modules Configuration
@ -169,7 +169,7 @@ Assume you are using redis auth plugin, for example:
#EMQX_RETAINER.MAX_PAYLOAD_SIZE = 1MB #EMQX_RETAINER.MAX_PAYLOAD_SIZE = 1MB
docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \ docker run -d --name emqx -p 18083:18083 -p 1883:1883 -p 4369:4369 \
-e EMQX_LISTENER__TCP__EXTERNAL=1883 \ -e EMQX_LISTENERS__TCP__DEFAULT=1883 \
-e EMQX_LOADED_PLUGINS="emqx_retainer" \ -e EMQX_LOADED_PLUGINS="emqx_retainer" \
-e EMQX_RETAINER__STORAGE_TYPE = "ram" \ -e EMQX_RETAINER__STORAGE_TYPE = "ram" \
-e EMQX_RETAINER__MAX_PAYLOAD_SIZE = 1MB \ -e EMQX_RETAINER__MAX_PAYLOAD_SIZE = 1MB \