Compare commits
39
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
981be3e23f | ||
|
|
4613388d0c | ||
|
|
2ba8f83f2e | ||
|
|
0ece6b12b2 | ||
|
|
b6c35f28e3 | ||
|
|
d4b84bb886 | ||
|
|
05a476d932 | ||
|
|
9035f9eb96 | ||
|
|
869754606e | ||
|
|
405eef034a | ||
|
|
9b3a61eb49 | ||
|
|
322411955e | ||
|
|
4716a40c3a | ||
|
|
9ab9b5c97e | ||
|
|
6707dbe28f | ||
|
|
8b70d43953 | ||
|
|
70c85011db | ||
|
|
34e108dbbc | ||
|
|
4395e900e9 | ||
|
|
0aea949b49 | ||
|
|
798735a0a8 | ||
|
|
5e9b92f507 | ||
|
|
b21fb1ac92 | ||
|
|
f2e6683a44 | ||
|
|
c4f962d120 | ||
|
|
352aa78a8f | ||
|
|
0c105e5224 | ||
|
|
e5f1ba44c8 | ||
|
|
f0f67afbcb | ||
|
|
4e517797e1 | ||
|
|
5bc1b52721 | ||
|
|
b357808e99 | ||
|
|
90d8838e15 | ||
|
|
bcc5e0d4d0 | ||
|
|
2e7d079f65 | ||
|
|
da7762b0cf | ||
|
|
61edf87116 | ||
|
|
a567579ab2 | ||
|
|
3433a6d945 |
No files matched your search
@@ -15,9 +15,9 @@ thirdParty:
|
||||
- { upstream: docker.io/library/rabbitmq:4.3-management, acr: library/rabbitmq:4.3-management, pushed: true }
|
||||
# ── edge 单元 + audit broker 硬依赖 ──
|
||||
- { upstream: docker.io/emqx/nanomq:0.25.2-2, acr: library/nanomq:0.25.2-2, pushed: true } # D2 已补推(2026-08-22)
|
||||
# ── 工具类 ──
|
||||
- { upstream: docker.io/library/busybox:latest, acr: library/busybox:latest, pushed: true }
|
||||
- { upstream: docker.io/library/alpine:3, acr: library/alpine:3, pushed: true }
|
||||
# ── 工具类(现场无组件直接依赖,备查;tag 以 ACR 实存为准,2026-08-22 盘点) ──
|
||||
- { upstream: docker.io/library/busybox:1.36, acr: library/busybox:1.36, pushed: true, optional: true }
|
||||
- { upstream: docker.io/library/alpine:3.19, acr: library/alpine:3.19, pushed: true, optional: true }
|
||||
# ── 可选(客户默认不部署) ──
|
||||
- { upstream: docker.io/emqx/mqttx-web:latest, acr: library/mqttx-web:latest, pushed: false, optional: true }
|
||||
- { upstream: docker.io/emqx/mqttx-web:latest, acr: library/mqttx-web:latest, pushed: true, optional: true } # mxlexus 已部署(2026-08-22)
|
||||
- { upstream: docker.io/library/mongo:7.0, acr: library/mongo:7.0, pushed: true, optional: true } # v2 audit 已去 mongo,存量备用
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-agent-unit
|
||||
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -6,6 +6,12 @@ Deploys one agent site as one Helm release:
|
||||
- `agent-web-<site>` frontend
|
||||
- `agent-<site>-postgres` StatefulSet and retained PVC
|
||||
|
||||
Agent PostgreSQL sessions set `idle_in_transaction_session_timeout` through the
|
||||
connection string. The default is `60s`, configurable with
|
||||
`sharedInfra.postgres.idleInTransactionSessionTimeout`. This is a database-side
|
||||
safety net for leaked idle transactions and does not change database users,
|
||||
passwords, roles, or the PostgreSQL StatefulSet credential model.
|
||||
|
||||
Example:
|
||||
|
||||
```bash
|
||||
|
||||
@@ -103,7 +103,7 @@ stringData:
|
||||
ConnectionStrings__redis: "{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }},password={{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_PASSWORD: "{{ .Values.sharedInfra.redis.password }}"
|
||||
REDIS_URI: "redis://:{{ .Values.sharedInfra.redis.password }}@{{ .Values.sharedInfra.redis.host }}:{{ .Values.sharedInfra.redis.port }}"
|
||||
ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }}"
|
||||
ConnectionStrings__PostgreSQL: "Host={{ $pgHost }};Port={{ .Values.sharedInfra.postgres.port }};Username={{ .Values.sharedInfra.postgres.username }};Password={{ .Values.sharedInfra.postgres.password }};Database={{ $database }};Options=-c idle_in_transaction_session_timeout={{ .Values.sharedInfra.postgres.idleInTransactionSessionTimeout }}"
|
||||
POSTGRESQL_PASSWORD: "{{ .Values.sharedInfra.postgres.password }}"
|
||||
POSTGRESQL_URI: "postgresql://{{ .Values.sharedInfra.postgres.username }}:{{ .Values.sharedInfra.postgres.password }}@{{ $pgHost }}:{{ .Values.sharedInfra.postgres.port }}/{{ $database }}"
|
||||
POSTGRESQL_DATABASENAME: "{{ $database }}"
|
||||
|
||||
@@ -48,6 +48,7 @@ sharedInfra:
|
||||
username: postgres
|
||||
password: "Admin12345"
|
||||
port: 5432
|
||||
idleInTransactionSessionTimeout: 60s
|
||||
redis:
|
||||
host: redis-service
|
||||
port: 6379
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-audit
|
||||
description: MixingX audit service.
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-edge-unit
|
||||
description: "One MixingX edge unit release with durable local revision storage."
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-gateway
|
||||
description: MixingX gateway service, RBAC, and root ingress.
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-infra
|
||||
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-mqttx
|
||||
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -0,0 +1,6 @@
|
||||
apiVersion: v2
|
||||
name: mixingx-network-agent
|
||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||
type: application
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -0,0 +1,95 @@
|
||||
apiVersion: apps/v1
|
||||
kind: DaemonSet
|
||||
metadata:
|
||||
name: network-agent
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/instance: {{ .Release.Name }}
|
||||
app.kubernetes.io/component: network-agent
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app.kubernetes.io/component: network-agent
|
||||
template:
|
||||
metadata:
|
||||
labels:
|
||||
app.kubernetes.io/component: network-agent
|
||||
annotations:
|
||||
# 容器内 nmcli 通过 D-Bus 操作主机 NetworkManager,
|
||||
# 需要 unconfined 才能通过 dbus-daemon 的 AppArmor 仲裁
|
||||
container.apparmor.security.beta.kubernetes.io/network-agent: unconfined
|
||||
spec:
|
||||
# hostNetwork: IP 变更后 agent 在新 IP 上继续存活,负责回滚与 k3s 自愈;
|
||||
# 前端弹窗直连 http://<节点IP>:9750 即命中该节点的 agent
|
||||
hostNetwork: true
|
||||
dnsPolicy: ClusterFirstWithHostNet
|
||||
{{- if .Values.nodeName }}
|
||||
nodeName: {{ .Values.nodeName }}
|
||||
{{- else if .Values.nodeSelector }}
|
||||
nodeSelector:
|
||||
{{ toYaml .Values.nodeSelector | indent 8 }}
|
||||
{{- end }}
|
||||
{{- with .Values.imagePullSecrets }}
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: network-agent
|
||||
image: {{ .Values.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.ports.http }}
|
||||
protocol: TCP
|
||||
env:
|
||||
- name: TZ
|
||||
value: {{ .Values.timezone | default "Asia/Shanghai" | quote }}
|
||||
- name: ASPNETCORE_URLS
|
||||
value: "http://0.0.0.0:{{ .Values.ports.http }}"
|
||||
- name: AUTH_TOKEN
|
||||
value: {{ .Values.authToken | quote }}
|
||||
- name: CORS_ORIGINS
|
||||
value: {{ .Values.corsOrigins | quote }}
|
||||
- name: ROLLBACK_TIMEOUT_SECONDS
|
||||
value: {{ .Values.rollbackTimeoutSeconds | quote }}
|
||||
- name: K3S_RESTART_ON_IP_CHANGE
|
||||
value: {{ .Values.k3sRestartOnIpChange | quote }}
|
||||
securityContext:
|
||||
# 只需 root + D-Bus socket,无需 privileged 与额外 capability:
|
||||
# nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行
|
||||
runAsUser: 0
|
||||
allowPrivilegeEscalation: false
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
path: /api/network/health
|
||||
port: {{ .Values.ports.http }}
|
||||
initialDelaySeconds: 15
|
||||
periodSeconds: 30
|
||||
timeoutSeconds: 5
|
||||
failureThreshold: 6
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: /api/network/health
|
||||
port: {{ .Values.ports.http }}
|
||||
initialDelaySeconds: 5
|
||||
periodSeconds: 15
|
||||
timeoutSeconds: 5
|
||||
failureThreshold: 6
|
||||
resources:
|
||||
{{ toYaml .Values.resources | indent 12 }}
|
||||
volumeMounts:
|
||||
# 主机 system bus: nmcli 与 systemd 重启都走它
|
||||
- name: dbus
|
||||
mountPath: /run/dbus/system_bus_socket
|
||||
# 网卡别名持久化: aliases.json 落宿主机,重启/重建 Pod 均保留
|
||||
- name: alias-store
|
||||
mountPath: /var/lib/mixingx/network-agent
|
||||
volumes:
|
||||
- name: dbus
|
||||
hostPath:
|
||||
path: /run/dbus/system_bus_socket
|
||||
type: Socket
|
||||
- name: alias-store
|
||||
hostPath:
|
||||
path: /var/lib/mixingx/network-agent
|
||||
type: DirectoryOrCreate
|
||||
@@ -0,0 +1,22 @@
|
||||
# Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。
|
||||
# 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问
|
||||
# (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。
|
||||
# mixingx.io/role 标签让 Gateway 发现该服务并生成 /api/network/** 透传路由,
|
||||
# 前端网络设置弹窗经 Gateway 同源转发访问(消除跨域)。
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
name: network-agent
|
||||
labels:
|
||||
app.kubernetes.io/name: mixingx
|
||||
app.kubernetes.io/component: network-agent
|
||||
mixingx.io/role: network-agent
|
||||
mixingx.io/node-id: network-agent
|
||||
spec:
|
||||
clusterIP: None
|
||||
selector:
|
||||
app.kubernetes.io/component: network-agent
|
||||
ports:
|
||||
- name: http
|
||||
port: {{ .Values.ports.http }}
|
||||
targetPort: http
|
||||
@@ -0,0 +1,34 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
image:
|
||||
repository: network-agent
|
||||
tag: latest
|
||||
|
||||
ports:
|
||||
http: 9750
|
||||
|
||||
# 鉴权令牌:为空则不启用(仅限内网联调);生产环境必须配置,
|
||||
# 前端弹窗请求头 Authorization: Bearer <token>
|
||||
authToken: ""
|
||||
|
||||
# 前端弹窗的跨域来源,逗号分隔;* = 任意(联调)
|
||||
corsOrigins: "*"
|
||||
|
||||
# 改静态 IP 后未确认自动回滚的窗口(秒)
|
||||
rollbackTimeoutSeconds: 60
|
||||
|
||||
# 确认 IP 变更后自动重启本机 k3s/k3s-agent(flannel 重绑新 IP)
|
||||
k3sRestartOnIpChange: true
|
||||
|
||||
# 只在指定节点部署(为空 = 每个节点一个,推荐)
|
||||
nodeName: ""
|
||||
nodeSelector: {}
|
||||
|
||||
resources:
|
||||
requests:
|
||||
cpu: 50m
|
||||
memory: 128Mi
|
||||
limits:
|
||||
cpu: 500m
|
||||
memory: 256Mi
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-platform
|
||||
description: MixingX central platform services without customer edge/agent instances.
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-protocol-server-unit
|
||||
description: Deploy one MixingX edge protocol test server instance.
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-sso
|
||||
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-ultra
|
||||
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
|
||||
type: application
|
||||
version: 1.0.1
|
||||
appVersion: "1.0.1"
|
||||
version: 1.0.20
|
||||
appVersion: "1.0.20"
|
||||
Reference in new issue
Block a user