diff --git a/release-charts/mixingx-edge-unit/templates/nanomq.yaml b/release-charts/mixingx-edge-unit/templates/nanomq.yaml index 7ed8169..e4ee28f 100644 --- a/release-charts/mixingx-edge-unit/templates/nanomq.yaml +++ b/release-charts/mixingx-edge-unit/templates/nanomq.yaml @@ -31,6 +31,12 @@ spec: - name: mqtt containerPort: {{ .Values.mqtt.port }} protocol: TCP + # WebSocket listener:emqx/nanomq 镜像默认开启 8083(路径 /mqtt)。 + # 声明此 containerPort 供 MQTTX Web 等浏览器客户端通过 ws 连接。 + # Service 默认 ClusterIP,运维需外部调试时手动改 NodePort。 + - name: ws + containerPort: {{ .Values.mqtt.wsPort | default 8083 }} + protocol: TCP resources: {{ toYaml .Values.mqtt.resources | default dict | nindent 12 }} --- @@ -54,4 +60,8 @@ spec: port: {{ .Values.mqtt.port }} targetPort: mqtt protocol: TCP + - name: ws + port: {{ .Values.mqtt.wsPort | default 8083 }} + targetPort: ws + protocol: TCP {{- end }} diff --git a/release-charts/mixingx-edge-unit/values.yaml b/release-charts/mixingx-edge-unit/values.yaml index aaef2a4..2cbc807 100644 --- a/release-charts/mixingx-edge-unit/values.yaml +++ b/release-charts/mixingx-edge-unit/values.yaml @@ -58,5 +58,6 @@ mqtt: repository: emqx/nanomq tag: 0.25.2-2 port: 1883 + wsPort: 8083 # WebSocket listener(NanoMQ 镜像默认开启,路径 /mqtt),供 MQTTX Web 连接 credentialRef: "" # 默认空,模板内 default 为 {name}-mqtt resources: {} diff --git a/release-charts/mixingx-mqttx/Chart.yaml b/release-charts/mixingx-mqttx/Chart.yaml new file mode 100644 index 0000000..a3ef8db --- /dev/null +++ b/release-charts/mixingx-mqttx/Chart.yaml @@ -0,0 +1,6 @@ +apiVersion: v2 +name: mixingx-mqttx +description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。 +type: application +version: 0.1.0 +appVersion: "1.0.1" diff --git a/release-charts/mixingx-mqttx/templates/_helpers.tpl b/release-charts/mixingx-mqttx/templates/_helpers.tpl new file mode 100644 index 0000000..7dd421b --- /dev/null +++ b/release-charts/mixingx-mqttx/templates/_helpers.tpl @@ -0,0 +1,6 @@ +{{/* +组件名(默认 mqttx,可被 values 覆盖)。 +*/}} +{{- define "mixingx-mqttx.name" -}} +{{- .Values.mqttx.name | default "mqttx" -}} +{{- end -}} diff --git a/release-charts/mixingx-mqttx/templates/ingress.yaml b/release-charts/mixingx-mqttx/templates/ingress.yaml new file mode 100644 index 0000000..9454797 --- /dev/null +++ b/release-charts/mixingx-mqttx/templates/ingress.yaml @@ -0,0 +1,25 @@ +{{- $name := include "mixingx-mqttx.name" . }} +{{- if .Values.ingress.enabled }} +--- +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: {{ $name }}-ingress + annotations: +{{- range $k, $v := .Values.ingress.annotations }} + {{ $k }}: {{ $v | quote }} +{{- end }} +spec: + ingressClassName: {{ .Values.ingress.className }} + rules: + - host: {{ .Values.ingress.host }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ $name }}-service + port: + number: 80 +{{- end }} diff --git a/release-charts/mixingx-mqttx/templates/mqttx.yaml b/release-charts/mixingx-mqttx/templates/mqttx.yaml new file mode 100644 index 0000000..9235f63 --- /dev/null +++ b/release-charts/mixingx-mqttx/templates/mqttx.yaml @@ -0,0 +1,64 @@ +{{- $root := . }} +{{- $name := include "mixingx-mqttx.name" . }} +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: {{ $name }}-deployment + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/instance: {{ $root.Release.Name }} + app.kubernetes.io/component: {{ $name }} +spec: + replicas: {{ .Values.mqttx.replicas | default 1 }} + selector: + matchLabels: + app.kubernetes.io/component: {{ $name }} + template: + metadata: + labels: + app.kubernetes.io/component: {{ $name }} + spec: + containers: + - name: {{ $name }} + image: "{{ .Values.mqttx.image.repository }}:{{ .Values.mqttx.image.tag | default "latest" }}" + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 80 + protocol: TCP + env: + - name: TZ + value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}" + # emqx/mqttx-web 是纯静态 nginx 镜像,无健康端点;用 TCP 探针探 80 端口。 + livenessProbe: + tcpSocket: + port: http + initialDelaySeconds: 10 + periodSeconds: 30 + readinessProbe: + tcpSocket: + port: http + initialDelaySeconds: 5 + periodSeconds: 10 +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ $name }}-service + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: {{ $name }} + mixingx.io/role: mqttx + mixingx.io/node-id: {{ $name }} + annotations: + mixingx.io/description: {{ .Values.mqttx.description | quote }} +spec: + type: ClusterIP + selector: + app.kubernetes.io/component: {{ $name }} + ports: + - name: http + port: 80 + targetPort: http + protocol: TCP diff --git a/release-charts/mixingx-mqttx/values.yaml b/release-charts/mixingx-mqttx/values.yaml new file mode 100644 index 0000000..ba59c1d --- /dev/null +++ b/release-charts/mixingx-mqttx/values.yaml @@ -0,0 +1,27 @@ +# MQTTX Web: 浏览器端 MQTT 客户端 (emqx/mqttx-web, 容器内 nginx:80 纯静态 SPA)。 +# 部署后通过浏览器用 WebSocket 连各 Edge 的 NanoMQ,开发/调试 MQTT 流量。 +# +# 连 NanoMQ 的方式: +# NanoMQ Service 默认 ClusterIP(外部不可达),运维需把目标 Edge 的 NanoMQ Service +# 临时改成 NodePort(kubectl patch svc -nanomq-service -p '{"spec":{"type":"NodePort"}}' +# 并在 Service 上声明 ws 端口),然后在 MQTTX Web 新建连接填: +# ws://<节点IP>:/mqtt +# +# Ingress:demo 环境有 *.mixingx.local DNS,用 host 暴露;无 DNS 的现场改用 NodePort。 + +timezone: Asia/Shanghai + +mqttx: + name: mqttx + replicas: 1 + image: + repository: emqx/mqttx-web + tag: latest + description: "MQTT 监控客户端" + +ingress: + enabled: true + className: traefik + host: mqttx.mixingx.local + annotations: + traefik.ingress.kubernetes.io/router.entrypoints: web