Compare commits

..
Author SHA1 Message Date
ximenchuifeng ceeb5474a9 feat(gateway): 更新中心集群支撑——prepull Role + ArgoCD 配置可选注入(暂驻分支不合并)
- gateway-rbac 追加 gateway-prepull-manager Role/RoleBinding(daemonsets
  增删查 + pods 只读,挂既有 gateway-sa):更新中心预拉取 DS 编排所需
- gateway Deployment 支持可选注入 gateway.updateCenter.argocdUrl /
  argocdTokenSecret → env Update__ArgoCd__*(缺省不注入 = 清单功能 503 降级)
2026-09-09 07:54:13 +08:00
38 changed files with 240 additions and 446 deletions

No files matched your search

-16
View File
@@ -35,22 +35,6 @@ helm template ci-edge release-charts/mixingx-edge-unit
`mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。 `mixingx-deploy` 的 ApplicationSet 按 unit chart 逐个发布,每个 edge/agent 一个独立 Helm release。详见 `mixingx-deploy/`。
## PostgreSQL on K3s
PostgreSQL StatefulSets use the Debian image's UID/GID 999 and run the image
entrypoint directly. This skips gosu while preserving database initialization
and startup on the existing data volume. The readiness probe uses
`pg_isready` over TCP so the container is Ready only after PostgreSQL accepts
connections, including after recovery.
Only the PostgreSQL container uses `privileged: true` as a temporary workaround
for checkpoint signal failures observed on affected Ubuntu 26.04 / K3s nodes.
The namespace's admission policy must permit privileged containers. The
[containerd signal-denial report](https://github.com/containerd/containerd/issues/14485)
describes the same checkpoint error with AppArmor. Check the host kernel log
for an AppArmor signal denial and validate initialization and recovery with the
corrected runtime or profile before removing privileged mode.
## 关联文档 ## 关联文档
- hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南 - hub [AGENTS.md](https://gitee.com/mixing-tech/mixingx.hub) — 全项目指南
-1
View File
@@ -10,7 +10,6 @@ This directory contains the release-oriented charts for Phase 1 ownership split:
- `mixingx-edge-unit`: one edge site release. - `mixingx-edge-unit`: one edge site release.
- `mixingx-agent-unit`: one agent site release. - `mixingx-agent-unit`: one agent site release.
- `mixingx-protocol-server-unit`: one protocol mock server instance. - `mixingx-protocol-server-unit`: one protocol mock server instance.
- `mixingx-codeserver`: browser VS Code test IDE (code-server, plugins bundled in image).
- `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration. - `mixingx-platform`: **legacy** central-services chart, kept for compatibility during migration.
The chart at the repository root is kept as a legacy all-in-one chart during migration. The chart at the repository root is kept as a legacy all-in-one chart during migration.
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-agent-unit name: mixingx-agent-unit
description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL." description: "One MixingX agent unit release: agent backend, agent web, and agent PostgreSQL."
type: application type: application
version: 1.0.91 version: 1.0.3
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -207,11 +207,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-unit.followerScheduling" . | nindent 6 }} {{ include "mixingx-unit.followerScheduling" . | nindent 6 }}
{{- with $.Values.imagePullSecrets }} {{- with $.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -221,10 +216,6 @@ spec:
- name: postgres - name: postgres
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }} image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ .Values.sharedInfra.postgres.password }}" value: "{{ .Values.sharedInfra.postgres.password }}"
@@ -238,15 +229,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ .Values.ports.postgres }} containerPort: {{ .Values.ports.postgres }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ .Values.ports.postgres }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-audit name: mixingx-audit
description: MixingX audit service. description: MixingX audit service.
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -31,11 +31,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-audit.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }} {{- with $.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -45,10 +40,6 @@ spec:
- name: postgres - name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ $root.Values.sharedInfra.postgres.password }}" value: "{{ $root.Values.sharedInfra.postgres.password }}"
@@ -62,15 +53,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ $root.Values.sharedInfra.postgres.port }} containerPort: {{ $root.Values.sharedInfra.postgres.port }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
@@ -46,12 +46,9 @@ spec:
key: AUDIT_PG_URI key: AUDIT_PG_URI
- name: AUDIT_PG_TIMEZONE - name: AUDIT_PG_TIMEZONE
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}" value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
# 数据保留月数(按自然月清理分区;operations 表) # 数据保留月数(按自然月清理分区)
- name: AUDIT_RETENTION_MONTHS - name: AUDIT_RETENTION_MONTHS
value: "{{ .Values.audit.retentionMonths | default 6 }}" value: "{{ .Values.audit.retentionMonths | default 6 }}"
# 错误流水独立保留月数(errors 表,分表独立清除)
- name: AUDIT_ERROR_RETENTION_MONTHS
value: "{{ .Values.audit.errorRetentionMonths | default 3 }}"
# MQTT broker # MQTT broker
- name: AUDIT_MQTT_BROKER_URL - name: AUDIT_MQTT_BROKER_URL
value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}" value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}"
+1 -3
View File
@@ -24,10 +24,8 @@ audit:
replicas: 2 replicas: 2
database: audit-db database: audit-db
pgStorage: 5Gi pgStorage: 5Gi
# 操作流水(audit_operations)保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS) # 数据保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
retentionMonths: 6 retentionMonths: 6
# 错误流水(audit_errors)独立保留月数(后端 AUDIT_ERROR_RETENTION_MONTHS,2026-10-26 裁决:分表独立)
errorRetentionMonths: 3
# JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL # JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL
jwt: jwt:
ssoBaseUrl: "http://sso-service:8080" ssoBaseUrl: "http://sso-service:8080"
@@ -1,6 +0,0 @@
apiVersion: v2
name: mixingx-codeserver
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
type: application
version: 1.0.91
appVersion: "1.0.91"
@@ -1,12 +0,0 @@
# mixingx-codeserver
浏览器版 VS Code 测试 IDE(code-server),供各环境在浏览器里临时查看/排查代码。
预装插件随镜像(mixingx/codeserver,mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版):
GitLens 19.2.0 / EditorConfig 0.18.2 / Prettier 12.4.0 / C#(muhammad-sammy 分支 2.145.21,linux-x64)/
.NET Runtime 3.2.0 / OPC UA Browser 1.2.4(微软市场 side-load,MIT)。
- 登录:密码认证,密码在各环境 values `codeserver.password`(明文,家规同 postgres/redis)。
- 持久化:工作区 `/home/coder/project` 落 PVC `<name>-data`(`storage.keep=true`,卸载不回收);
插件/设置烧在镜像层(不落盘,升级镜像即整体更新)。
- 入口:traefik ingress(`*.mixingx.local` DNS 环境),无 DNS 现场改 NodePort(参考 mqttx 注释)。
- 注意:单副本 + RWO 盘,Deployment 策略 Recreate;traefik 原生支持 WebSocket,无需额外注解。
@@ -1,13 +0,0 @@
{{/*
组件名(默认 codeserver,可被 values 覆盖)。
*/}}
{{- define "mixingx-codeserver.name" -}}
{{- .Values.codeserver.name | default "codeserver" -}}
{{- end -}}
{{/*
Secret 数据(登录密码);Deployment 用它的 sha256 做滚动重启锚点。
*/}}
{{- define "mixingx-codeserver.secretData" -}}
PASSWORD: {{ .Values.codeserver.password | default "changeme" | quote }}
{{- end -}}
@@ -1,127 +0,0 @@
{{- $root := . }}
{{- $name := include "mixingx-codeserver.name" . }}
---
apiVersion: v1
kind: Secret
metadata:
name: {{ $name }}-secrets
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
type: Opaque
stringData:
{{- include "mixingx-codeserver.secretData" . | nindent 2 }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: {{ $name }}-data
{{- if .Values.storage.keep }}
annotations:
helm.sh/resource-policy: keep
{{- end }}
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/instance: {{ $root.Release.Name }}
app.kubernetes.io/component: {{ $name }}
spec:
accessModes:
- ReadWriteOnce
storageClassName: {{ .Values.storage.className | default "local-path" }}
resources:
requests:
storage: {{ .Values.storage.size | default "5Gi" }}
---
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:
# RWO 工作区数据盘 + 单副本:滚动更新会新旧 Pod 争盘,必须 Recreate
strategy:
type: Recreate
replicas: {{ .Values.codeserver.replicas | default 1 }}
selector:
matchLabels:
app.kubernetes.io/component: {{ $name }}
template:
metadata:
labels:
app.kubernetes.io/component: {{ $name }}
annotations:
# 密码变更 → 校验和变化 → 滚动重启生效
checksum/secret: {{ include "mixingx-codeserver.secretData" . | sha256sum }}
spec:
{{- with $.Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
securityContext:
# 镜像内置用户 coder(uid/gid 1000);fsGroup 使 local-path 数据盘归属 coder
runAsUser: 1000
runAsGroup: 1000
fsGroup: 1000
containers:
- name: {{ $name }}
image: "{{ .Values.codeserver.image.repository }}:{{ .Values.codeserver.image.tag | default "latest" }}"
imagePullPolicy: IfNotPresent
args:
- --auth=password
- --bind-addr=0.0.0.0:8080
- /home/coder/project
ports:
- name: http
containerPort: 8080
protocol: TCP
env:
- name: TZ
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
envFrom:
- secretRef:
name: {{ $name }}-secrets
volumeMounts:
- name: data
mountPath: /home/coder/project
resources:
{{- toYaml .Values.resources | nindent 12 }}
# code-server 未认证 GET / 返回 302(跳登录页),httpGet 判活有歧义,统一 TCP 探针
livenessProbe:
tcpSocket:
port: http
initialDelaySeconds: 15
periodSeconds: 30
readinessProbe:
tcpSocket:
port: http
initialDelaySeconds: 5
periodSeconds: 10
volumes:
- name: data
persistentVolumeClaim:
claimName: {{ $name }}-data
---
apiVersion: v1
kind: Service
metadata:
name: {{ $name }}-service
labels:
app.kubernetes.io/name: mixingx
app.kubernetes.io/component: {{ $name }}
mixingx.io/role: codeserver
mixingx.io/node-id: {{ $name }}
annotations:
mixingx.io/description: {{ .Values.codeserver.description | quote }}
spec:
type: ClusterIP
selector:
app.kubernetes.io/component: {{ $name }}
ports:
- name: http
port: 80
targetPort: http
protocol: TCP
@@ -1,25 +0,0 @@
{{- $name := include "mixingx-codeserver.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 }}
@@ -1,40 +0,0 @@
# code-server(web VS Code)测试版:预装插件随镜像(GitLens/EditorConfig/Prettier/C# 分支/OPC UA Browser)。
# 用途:各环境浏览器内 IDE,临时查看/排查代码;不是开发主力环境。
# 镜像:mixingx/codeserver(mxcicd 构建,基镜像 coder/code-server:4.139.1 锁版,不走 image-version.yaml 的 images 机制)。
# 密码:values 明文(家规同 postgres/redis);登录 http://<ingress host>。
timezone: Asia/Shanghai
# 客户环境由 environments/_common 注入 imagePullSecrets(ADR-66 编号见各仓引用);内网留空=匿名拉取,行为不变
imagePullSecrets: []
codeserver:
name: codeserver
replicas: 1
image:
repository: 192.168.1.119:8888/mixingx/codeserver
tag: v0.1.0
description: "浏览器版 VS Code(测试)"
# 登录密码(各环境 values 必须覆盖;changeme 仅保证 helm template 默认值可渲染)
password: "changeme"
storage:
# 工作区(/home/coder/project)数据盘;keep=true 时 helm uninstall/down 不回收
className: local-path
size: 5Gi
keep: true
resources:
requests:
memory: 512Mi
cpu: 200m
limits:
memory: 2Gi
cpu: "2"
ingress:
enabled: true
className: traefik
host: codeserver.mixingx.local
annotations:
traefik.ingress.kubernetes.io/router.entrypoints: web
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-edge-unit name: mixingx-edge-unit
description: "One MixingX edge unit release with durable local revision storage." description: "One MixingX edge unit release with durable local revision storage."
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
+1 -21
View File
@@ -14,25 +14,5 @@ helm upgrade --install mixingx-edge-workshop-a ./charts/mixingx-edge-unit \
--set site=workshop-a \ --set site=workshop-a \
--set nodeName=edge-node-01 \ --set nodeName=edge-node-01 \
--set storage.className=longhorn \ --set storage.className=longhorn \
--set tag=2026.07.02-abc1234 \ --set tag=2026.07.02-abc1234
--set adsRouter.localNetId=10.200.0.17.1.1 \
--set adsRouter.publicAddress=192.168.1.173
``` ```
## ADS Router(本地 AMS Router)
每个 Edge 默认随包启用本地 ADS Router(`adsRouter.enabled: true`),身份只接受显式部署注入,
没有任何共享默认兜底:`enabled=true` 时 `adsRouter.localNetId` 与 `adsRouter.publicAddress`
必填,缺失/留空会使 helm 渲染(及 ArgoCD 同步)直接失败。NetId 显式分配、重启不变,
运行时绝不从 Pod IP 推导;同 AMS 通信范围内各实例 NetId 前 4 字节必须互异,建议 `.1.1` 结尾。
| Value | 缺省 | 说明 |
|---|---|---|
| `adsRouter.enabled` | `true` | `false` 时不注入任何 `Ads__Router__*` env,Edge 侧本地 Router 禁用(routerState=disabled) |
| `adsRouter.localNetId` | `""`(必填) | 本方固定 AMS NetId,如 `10.200.0.17.1.1` |
| `adsRouter.publicAddress` | `""`(必填) | 对外登记地址,PLC 回程拨入,原样写入登记报文 ComputerName |
| `adsRouter.clientEndPoint` | `""` | 可选;`ip:port`,留空不注入 env(应用缺省 `127.0.0.1:48898`,SDK 本地客户端入口=回环通道绑定端点) |
| `adsRouter.externalPort` | `48898` | 可选;外部 TCP 监听==远端拨号端口(SDK 同一字段不可分离);置 0 不注入 env |
注入 env:`Ads__Router__LocalNetId`、`Ads__Router__PublicAddress`(恒注入),
`Ads__Router__ClientEndPoint`、`Ads__Router__ExternalPort`(仅值非空时注入)。
@@ -3,10 +3,6 @@
{{- $serviceId := include "mixingx-unit.serviceId" . -}} {{- $serviceId := include "mixingx-unit.serviceId" . -}}
{{- $basePath := include "mixingx-unit.basePath" . -}} {{- $basePath := include "mixingx-unit.basePath" . -}}
{{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}} {{- $brokerSvcName := include "mixingx-unit.mqttBrokerServiceName" . -}}
{{- /* ADS Router 身份强制:启用即必须显式给身份,禁止共享默认兜底(空/缺失=渲染失败)。 */ -}}
{{- if and .Values.adsRouter.enabled (or (not .Values.adsRouter.localNetId) (not .Values.adsRouter.publicAddress)) }}
{{- fail "adsRouter.enabled=true requires explicit adsRouter.localNetId and adsRouter.publicAddress (no shared default identity)" }}
{{- end }}
apiVersion: v1 apiVersion: v1
kind: PersistentVolumeClaim kind: PersistentVolumeClaim
metadata: metadata:
@@ -91,21 +87,6 @@ spec:
value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }} value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }}
- name: EdgeSecrets__Root - name: EdgeSecrets__Root
value: {{ .Values.edgeSecrets.root | quote }} value: {{ .Values.edgeSecrets.root | quote }}
{{- /* ADS Router 身份注入:必填两项恒注入;可选两项留空/置 0 则省略(应用侧缺省生效)。 */ -}}
{{- if .Values.adsRouter.enabled }}
- name: Ads__Router__LocalNetId
value: {{ .Values.adsRouter.localNetId | quote }}
- name: Ads__Router__PublicAddress
value: {{ .Values.adsRouter.publicAddress | quote }}
{{- with .Values.adsRouter.clientEndPoint }}
- name: Ads__Router__ClientEndPoint
value: {{ . | quote }}
{{- end }}
{{- with .Values.adsRouter.externalPort }}
- name: Ads__Router__ExternalPort
value: "{{ . }}"
{{- end }}
{{- end }}
volumeMounts: volumeMounts:
- name: edge-data - name: edge-data
mountPath: /var/lib/mixingx-edge mountPath: /var/lib/mixingx-edge
@@ -41,16 +41,6 @@ edgeSecrets:
nodeName: "" nodeName: ""
nodeSelector: {} nodeSelector: {}
# ADS Router 本地路由身份(契约 docs/research/2026-10-10-ads-router-impl/CONTRACT.md §2.1):
# 身份只接受显式部署注入,重启保持,运行时绝不从 Pod IP 推导,无共享默认兜底。
# enabled=true 时 localNetId/publicAddress 必填,缺失或留空 → helm 渲染明确失败(fail)。
adsRouter:
enabled: true
localNetId: "" # 本方固定 AMS NetId,如 "10.200.0.17.1.1";同 AMS 通信范围前 4 字节互异,建议 .1.1 结尾
publicAddress: "" # 对外登记地址(PLC 回程拨入的地址串,原样入登记报文 ComputerName)
clientEndPoint: "" # 可选;"ip:port",缺省 127.0.0.1:48898(SDK 本地客户端入口=回环通道绑定端点),留空不注入 env
externalPort: 48898 # 可选;外部 TCP 监听==远端拨号端口(SDK 同一字段不可分离),置 0 不注入 env
# Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。 # Audit 事件发布(ADR-0048/0049):指向中心 Audit Broker。
# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。 # enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。
# instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。 # instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-gateway name: mixingx-gateway
description: MixingX gateway service, RBAC, and root ingress. description: MixingX gateway service, RBAC, and root ingress.
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -33,4 +33,34 @@ roleRef:
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: gateway-sa name: gateway-sa
---
# 更新中心(ADR-0074 决策 7):预拉取 DaemonSet 编排——镜像提前铺到各节点,
# 客户点更新时新 Pod 命中本地缓存秒级切换。权限只有 daemonsets 增删查 + pods 只读。
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: gateway-prepull-manager
labels:
app.kubernetes.io/component: gateway
rules:
- apiGroups: ["apps"]
resources: ["daemonsets"]
verbs: ["create", "get", "list", "delete"]
- apiGroups: [""]
resources: ["pods"]
verbs: ["get", "list"]
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: gateway-prepull-manager-binding
labels:
app.kubernetes.io/component: gateway
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: gateway-prepull-manager
subjects:
- kind: ServiceAccount
name: gateway-sa
{{- end }} {{- end }}
@@ -52,6 +52,20 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
{{- end }} {{- end }}
{{- /* 更新中心(ADR-0074):ArgoCD 只读访问(镜像清单);缺省不注入 = 清单功能 503 降级 */}}
{{- with .Values.gateway.updateCenter }}
{{- with .argocdUrl }}
- name: Update__ArgoCd__BaseUrl
value: {{ . | quote }}
{{- end }}
{{- with .argocdTokenSecret }}
- name: Update__ArgoCd__Token
valueFrom:
secretKeyRef:
name: {{ .name | quote }}
key: {{ .key | default "token" | quote }}
{{- end }}
{{- end }}
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /health path: /health
@@ -9,9 +9,7 @@ metadata:
spec: spec:
ingressClassName: traefik ingressClassName: traefik
rules: rules:
- {{- if .Values.ingress.domain }} - host: {{ .Values.ingress.domain }}
host: {{ .Values.ingress.domain }}
{{- end }}
http: http:
paths: paths:
- path: / - path: /
@@ -34,7 +34,6 @@ gateway:
ingress: ingress:
enabled: true enabled: true
# domain 留空 = 渲染不带 host 的规则,现场 PC 可直接用节点 IP 访问(如 http://192.168.137.117/)
domain: app.mixingx.local domain: app.mixingx.local
gatewayService: gateway-service gatewayService: gateway-service
gatewayPort: 8080 gatewayPort: 8080
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-infra name: mixingx-infra
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ). description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-mqttx name: mixingx-mqttx
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。 description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-network-agent name: mixingx-network-agent
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。" description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
type: application type: application
version: 1.0.91 version: 0.1.0
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -29,10 +29,6 @@ spec:
nodeSelector: nodeSelector:
{{ toYaml .Values.nodeSelector | indent 8 }} {{ toYaml .Values.nodeSelector | indent 8 }}
{{- end }} {{- end }}
{{- with .Values.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
containers: containers:
- name: network-agent - name: network-agent
image: {{ .Values.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }} image: {{ .Values.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}
@@ -55,10 +51,13 @@ spec:
- name: K3S_RESTART_ON_IP_CHANGE - name: K3S_RESTART_ON_IP_CHANGE
value: {{ .Values.k3sRestartOnIpChange | quote }} value: {{ .Values.k3sRestartOnIpChange | quote }}
securityContext: securityContext:
# 只需 root + D-Bus socket,无需 privileged 与额外 capability: # 只需 root + D-Bus socket,无需 privileged
# nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行 # NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力)
runAsUser: 0 runAsUser: 0
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
add:
- NET_ADMIN
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/network/health path: /api/network/health
@@ -81,15 +80,15 @@ spec:
# 主机 system bus: nmcli 与 systemd 重启都走它 # 主机 system bus: nmcli 与 systemd 重启都走它
- name: dbus - name: dbus
mountPath: /run/dbus/system_bus_socket mountPath: /run/dbus/system_bus_socket
# 网卡别名持久化: aliases.json 落宿主机,重启/重建 Pod 均保留 - name: nm-run
- name: alias-store mountPath: /run/NetworkManager
mountPath: /var/lib/mixingx/network-agent readOnly: true
volumes: volumes:
- name: dbus - name: dbus
hostPath: hostPath:
path: /run/dbus/system_bus_socket path: /run/dbus/system_bus_socket
type: Socket type: Socket
- name: alias-store - name: nm-run
hostPath: hostPath:
path: /var/lib/mixingx/network-agent path: /run/NetworkManager
type: DirectoryOrCreate type: DirectoryOrCreate
@@ -1,8 +1,6 @@
# Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。 # Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。
# 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问 # 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问
# (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。 # (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。
# mixingx.io/role 标签让 Gateway 发现该服务并生成 /api/network/** 透传路由,
# 前端网络设置弹窗经 Gateway 同源转发访问(消除跨域)。
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
@@ -10,8 +8,6 @@ metadata:
labels: labels:
app.kubernetes.io/name: mixingx app.kubernetes.io/name: mixingx
app.kubernetes.io/component: network-agent app.kubernetes.io/component: network-agent
mixingx.io/role: network-agent
mixingx.io/node-id: network-agent
spec: spec:
clusterIP: None clusterIP: None
selector: selector:
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-platform name: mixingx-platform
description: MixingX central platform services without customer edge/agent instances. description: MixingX central platform services without customer edge/agent instances.
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -231,11 +231,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ .name }}-postgres app.kubernetes.io/component: {{ .name }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" .tierRole "root" $root) | nindent 6 }}
{{- with $root.Values.imagePullSecrets }} {{- with $root.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -245,10 +240,6 @@ spec:
- name: postgres - name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ $root.Values.sharedInfra.postgres.password }}" value: "{{ $root.Values.sharedInfra.postgres.password }}"
@@ -262,15 +253,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ $root.Values.sharedInfra.postgres.port }} containerPort: {{ $root.Values.sharedInfra.postgres.port }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
@@ -213,11 +213,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ .Values.audit.database }}-postgres app.kubernetes.io/component: {{ .Values.audit.database }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }} {{ include "mixingx-platform.tierAffinity" (dict "role" "audit" "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }} {{- with $.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -227,10 +222,6 @@ spec:
- name: postgres - name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ $root.Values.sharedInfra.postgres.password }}" value: "{{ $root.Values.sharedInfra.postgres.password }}"
@@ -244,15 +235,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ $root.Values.sharedInfra.postgres.port }} containerPort: {{ $root.Values.sharedInfra.postgres.port }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-protocol-server-unit name: mixingx-protocol-server-unit
description: Deploy one MixingX edge protocol test server instance. description: Deploy one MixingX edge protocol test server instance.
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-sso name: mixingx-sso
description: MixingX SSO standalone release (backend, web, and PostgreSQL). description: MixingX SSO standalone release (backend, web, and PostgreSQL).
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -197,11 +197,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-sso.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }} {{- with $.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -211,10 +206,6 @@ spec:
- name: postgres - name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ $root.Values.sharedInfra.postgres.password }}" value: "{{ $root.Values.sharedInfra.postgres.password }}"
@@ -228,15 +219,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ $root.Values.sharedInfra.postgres.port }} containerPort: {{ $root.Values.sharedInfra.postgres.port }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
+2 -2
View File
@@ -2,5 +2,5 @@ apiVersion: v2
name: mixingx-ultra name: mixingx-ultra
description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL." description: "MixingX Ultra dashboard standalone release: ultra backend, ultra web, and ultra PostgreSQL."
type: application type: application
version: 1.0.91 version: 1.0.1
appVersion: "1.0.91" appVersion: "1.0.1"
@@ -200,11 +200,6 @@ spec:
labels: labels:
app.kubernetes.io/component: {{ $name }}-postgres app.kubernetes.io/component: {{ $name }}-postgres
spec: spec:
securityContext:
# Run the image entrypoint as postgres so it does not invoke gosu.
runAsUser: 999
runAsGroup: 999
fsGroup: 999
{{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }} {{ include "mixingx-ultra.tierAffinity" (dict "role" $role "root" $root) | nindent 6 }}
{{- with $.Values.imagePullSecrets }} {{- with $.Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@@ -214,10 +209,6 @@ spec:
- name: postgres - name: postgres
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }} image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
command: ["docker-entrypoint.sh", "postgres"]
securityContext:
# Temporary compatibility workaround for checkpoint signal failures on affected k3s nodes.
privileged: true
env: env:
- name: POSTGRES_PASSWORD - name: POSTGRES_PASSWORD
value: "{{ $root.Values.sharedInfra.postgres.password }}" value: "{{ $root.Values.sharedInfra.postgres.password }}"
@@ -231,15 +222,6 @@ spec:
- name: tcp - name: tcp
containerPort: {{ $root.Values.sharedInfra.postgres.port }} containerPort: {{ $root.Values.sharedInfra.postgres.port }}
protocol: TCP protocol: TCP
readinessProbe:
exec:
command:
- sh
- -ec
- >-
exec pg_isready -q -h 127.0.0.1 -p {{ $root.Values.sharedInfra.postgres.port }} -U "$POSTGRES_USER" -d "$POSTGRES_DB"
periodSeconds: 5
timeoutSeconds: 3
volumeMounts: volumeMounts:
- name: data - name: data
mountPath: /var/lib/postgresql/data mountPath: /var/lib/postgresql/data
+112
View File
@@ -0,0 +1,112 @@
#!/usr/bin/env bash
# ============================================================================
# provision-host.sh — MixingX network-agent 主机初始化 (Ubuntu Server 20.04+)
#
# 职责(幂等,可重复执行):
# 1. 安装并启动 NetworkManager(服务器版默认未装)
# 2. 读取主网口当前网络参数,预创建等值静态 NM 连接(切换前后地址不变,不断网)
# 3. 创建低优先级 DHCP 救援连接(静态配错时的主机侧兜底)
# 4. 禁用 cloud-init 网络管理,netplan renderer 切换为 NetworkManager
# 5. rfkill 解锁无线网卡
# 6. 安装 polkit 放行规则(容器内 root 调用 NM/systemd D-Bus)
#
# 用法: sudo bash provision-host.sh
# 回滚: sudo bash rollback-host.sh
# 备份: /var/backups/mixingx-netconsole/
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
command -v ip >/dev/null 2>&1 || die "缺少 ip 命令"
mkdir -p "$BACKUP_DIR"
# ── 1. 安装 NetworkManager ────────────────────────────────────────────────
if ! command -v nmcli >/dev/null 2>&1; then
log "安装 NetworkManager ..."
export DEBIAN_FRONTEND=noninteractive
apt-get update -qq
apt-get install -y -qq network-manager
fi
# 关闭 NM 自动建连(未配置网卡自动 DHCP),避免与现有 networkd 抢接口
mkdir -p /etc/NetworkManager/conf.d
cat > /etc/NetworkManager/conf.d/99-mixingx.conf <<'EOF'
[main]
no-auto-default=*
EOF
systemctl enable --now NetworkManager >/dev/null 2>&1 || true
# ── 2. 识别主网口并读取当前参数 ───────────────────────────────────────────
PRIMARY_IF=$(ip -4 route show default | awk '{print $5; exit}')
[[ -n "${PRIMARY_IF:-}" ]] || die "未找到默认路由网卡(主机当前无网络?)"
PRIMARY_TYPE=$(ip link show "$PRIMARY_IF" | grep -o 'link/[a-z]*' | head -1)
CUR_ADDR=$(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2; exit}') # x.x.x.x/前缀
CUR_GW=$(ip -4 route show default | awk '{print $3; exit}')
CUR_DNS4=$(grep -h '^nameserver' /run/systemd/resolve/resolv.conf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf 2>/dev/null \
| awk '{print $2}' | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$' | sort -u | tr '\n' ' ')
log "主网口 $PRIMARY_IF 当前: 地址=$CUR_ADDR 网关=$CUR_GW DNS4=${CUR_DNS4:-<无>}"
# ── 3. 救援连接(仅以太网主口;WiFi 主口跳过——救援 DHCP 对 WiFi 无意义) ────
if [[ "$PRIMARY_TYPE" == "ethernet"* ]]; then
if ! nmcli connection show "rescue-dhcp" >/dev/null 2>&1; then
log "创建救援 DHCP 连接 rescue-dhcp (autoconnect-priority -100)"
nmcli connection add type ethernet ifname "$PRIMARY_IF" con-name "rescue-dhcp" \
ipv4.method auto \
connection.autoconnect yes \
connection.autoconnect-priority -100 >/dev/null
fi
fi
# ── 4. 全局切换 netplan renderer → NetworkManager ────────────────────────
# 不删除原 netplan 配置(ethernet/wifi 定义、SSID/PSK 原样保留),
# netplan 会把原有连接定义自动渲染为等值的 NM profiles,无缝接管
if [[ ! -f /etc/netplan/90-mixingx-nm.yaml ]]; then
log "备份原 netplan 配置 → $BACKUP_DIR/netplan/"
mkdir -p "$BACKUP_DIR/netplan"
cp -a /etc/netplan/*.yaml "$BACKUP_DIR/netplan/" 2>/dev/null || true
log "禁用 cloud-init 网络管理"
mkdir -p /etc/cloud/cloud.cfg.d
echo "network: {config: disabled}" > /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "写入全局 renderer=NetworkManager"
cat > /etc/netplan/90-mixingx-nm.yaml <<'EOF'
network:
version: 2
renderer: NetworkManager
EOF
chmod 600 /etc/netplan/90-mixingx-nm.yaml
fi
log "应用 netplan (交给 NetworkManager 托管)..."
netplan apply
# ── 5. 无线解锁 + polkit 放行 ─────────────────────────────────────────────
rfkill unblock all 2>/dev/null || true
if command -v pkexec >/dev/null 2>&1 || dpkg -s policykit-1 >/dev/null 2>&1; then
mkdir -p /etc/polkit-1/localauthority/50-local.d
cat > /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla <<'EOF'
[MixingX Network Agent]
Identity=unix-user:root
Action=org.freedesktop.NetworkManager.*;org.freedesktop.systemd1.*
ResultAny=yes
ResultInactive=yes
ResultActive=yes
EOF
fi
# ── 6. 校验 ───────────────────────────────────────────────────────────────
sleep 3
log "当前设备状态:"
nmcli -g DEVICE,TYPE,STATE,CONNECTION device status
log "主网口地址: $(ip -4 addr show dev "$PRIMARY_IF" | awk '/inet /{print $2}')"
log "完成。后续用 k3s 弹窗或 nmcli 管理;回滚执行 rollback-host.sh"
+48
View File
@@ -0,0 +1,48 @@
#!/usr/bin/env bash
# ============================================================================
# rollback-host.sh — provision-host.sh 的反向操作
#
# 职责:
# 1. 恢复原 netplan 配置(从 /var/backups/mixingx-netconsole/netplan/)
# 2. 恢复 cloud-init 网络管理
# 3. 停用 NetworkManager 托管(服务禁用,连接配置保留)
# 4. 移除 polkit 放行规则
#
# 用法: sudo bash rollback-host.sh
# ============================================================================
set -euo pipefail
BACKUP_DIR=/var/backups/mixingx-netconsole
log() { echo -e "\033[32m[mixingx]\033[0m $*"; }
die() { echo -e "\033[31m[mixingx] 错误: $*\033[0m" >&2; exit 1; }
[[ $EUID -eq 0 ]] || die "请用 root 运行: sudo bash $0"
# ── 1. 恢复 netplan ───────────────────────────────────────────────────────
if [[ -d "$BACKUP_DIR/netplan" ]] && ls "$BACKUP_DIR/netplan"/*.yaml >/dev/null 2>&1; then
log "恢复备份的 netplan 配置"
rm -f /etc/netplan/90-mixingx-nm.yaml
cp -a "$BACKUP_DIR/netplan"/*.yaml /etc/netplan/
else
log "无备份,仅移除 NM renderer 配置(回退到 renderer 默认)"
rm -f /etc/netplan/90-mixingx-nm.yaml
fi
# ── 2. 恢复 cloud-init 网络管理 ───────────────────────────────────────────
rm -f /etc/cloud/cloud.cfg.d/99-disable-network-config.cfg
log "应用恢复的 netplan ..."
netplan apply
# ── 3. 停用 NetworkManager ────────────────────────────────────────────────
log "停用并禁用 NetworkManager"
systemctl disable --now NetworkManager >/dev/null 2>&1 || true
# ── 4. 移除 polkit 规则 / NM 覆盖配置 ─────────────────────────────────────
rm -f /etc/polkit-1/localauthority/50-local.d/49-mixingx-network-agent.pkla
rm -f /etc/NetworkManager/conf.d/99-mixingx.conf
sleep 3
ip -4 addr show | awk '/inet /{print " " $2 " @ " $NF}'
log "回滚完成。NM 连接配置保留在 /etc/NetworkManager/system-connections/ (可手工清理)"