Compare commits

...
Author SHA1 Message Date
王野 673ac6aa6f release: bump chart version to v1.0.51 2026-09-30 07:26:06 +00:00
薛佳帆 7bd4d58a6d release: bump chart version to v1.0.50 2026-09-29 11:19:27 +00:00
ximenchuifeng 7944c98fdb release: bump chart version to v1.0.49 2026-09-29 07:52:24 +00:00
ximenchuifeng 50b47a556a feat: 新增 mixingx-codeserver chart——浏览器版 VS Code 测试 IDE(code-server 4.139.1 锁版镜像,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser;工作区 PVC keep;Recreate 单副本;traefik ingress) 2026-09-29 15:14:14 +08:00
薛佳帆 60c8b4d90e release: bump chart version to v1.0.48 2026-09-29 05:37:56 +00:00
薛佳帆 22fd52f20f release: bump chart version to v1.0.47 2026-09-29 03:08:53 +00:00
薛佳帆 7d1bc2d90c release: bump chart version to v1.0.46 2026-09-29 02:33:26 +00:00
薛佳帆 ada89158fa release: bump chart version to v1.0.45 2026-09-29 02:32:30 +00:00
薛佳帆 c3f27ee62b Revert "feat(agent-unit): 特征值预警 Redis 近端窗口开关 env(FeatureValueWarningCache__*,AgentUnit 默认取单元名)"
This reverts commit b8659270e6.
2026-09-29 09:24:43 +08:00
薛佳帆 b8659270e6 feat(agent-unit): 特征值预警 Redis 近端窗口开关 env(FeatureValueWarningCache__*,AgentUnit 默认取单元名) 2026-09-29 09:06:59 +08:00
王野 bd0f20af0b release: bump chart version to v1.0.44 2026-09-28 07:11:28 +00:00
王野 ef0e2b5ce1 release: bump chart version to v1.0.43 2026-09-28 05:44:36 +00:00
ximenchuifeng e6ada86374 release: bump chart version to v1.0.42 2026-09-24 06:39:09 +00:00
ximenchuifeng 33908b6955 release: bump chart version to v1.0.41 2026-09-24 03:22:55 +00:00
ximenchuifeng f623c56853 release: bump chart version to v1.0.40 2026-09-24 02:57:06 +00:00
ximenchuifeng 1a1847ba7e release: bump chart version to v1.0.39 2026-09-24 02:04:52 +00:00
薛佳帆 c698fe14cc release: bump chart version to v1.0.38 2026-09-23 07:15:32 +00:00
薛佳帆 ee378168c0 release: bump chart version to v1.0.37 2026-09-23 01:56:11 +00:00
薛佳帆 41ccb587a9 release: bump chart version to v1.0.36 2026-09-23 01:55:39 +00:00
王野 84ddff1776 release: bump chart version to v1.0.35 2026-09-22 01:47:43 +00:00
王野 02583981cb release: bump chart version to v1.0.34 2026-09-22 01:46:49 +00:00
薛佳帆 bfec34fc70 release: bump chart version to v1.0.33 2026-09-21 11:32:03 +00:00
薛佳帆 b42271b704 release: bump chart version to v1.0.32 2026-09-21 11:30:49 +00:00
王野 3decc0f1a2 release: bump chart version to v1.0.31 2026-09-21 08:49:40 +00:00
王野 3bc2c6a1b4 release: bump chart version to v1.0.30 2026-09-21 06:35:25 +00:00
王野 1632267279 release: bump chart version to v1.0.29 2026-09-21 06:32:55 +00:00
薛佳帆 51123401a1 release: bump chart version to v1.0.28 2026-09-20 08:28:10 +00:00
王野 04e0105b91 release: bump chart version to v1.0.27 2026-09-20 02:37:24 +00:00
ximenchuifeng 3c5dff3857 release: bump chart version to v1.0.26 2026-09-18 05:49:34 +00:00
ximenchuifeng cf0cf6080f release: bump chart version to v1.0.25 2026-09-18 05:42:39 +00:00
薛佳帆 e5bf7090b4 release: bump chart version to v1.0.24 2026-09-17 09:00:20 +00:00
ximenchuifeng 943b045cad release: bump chart version to v1.0.23 2026-09-15 10:51:15 +00:00
薛佳帆 e988974374 release: bump chart version to v1.0.22 2026-09-15 09:54:26 +00:00
ximenchuifeng 224afb71f1 release: bump chart version to v1.0.21 2026-09-15 09:36:52 +00:00
王野 981be3e23f release: bump chart version to v1.0.20 2026-09-15 08:01:20 +00:00
薛佳帆 4613388d0c chore: 删除 provision/rollback-host 迁移脚本——主机已全面由 NM 托管且 networkd 已 mask,迁移工具不再需要;rollback 依赖 networkd 接管原配置,mask 状态下执行反而会导致接口失联 2026-09-15 10:09:17 +08:00
ximenchuifeng 2ba8f83f2e release: bump chart version to v1.0.19 2026-09-14 09:52:19 +00:00
ximenchuifeng 0ece6b12b2 release: bump chart version to v1.0.18 2026-09-14 07:00:23 +00:00
薛佳帆 b6c35f28e3 feat(network-agent): headless Service 打 mixingx.io/role=node-id 标签 —— 纳入 Gateway K8s 服务发现,生成 /api/network/** 透传路由;注释说明前端弹窗改经 Gateway 同源转发 2026-09-14 14:37:08 +08:00
mx-ops d4b84bb886 fix(network-agent): daemonset 补渲染 imagePullSecrets
ACR 私仓交付后 DaemonSet 无拉取凭据,匿名拉取报 insufficient_scope。
对齐其余 10 个 chart 的标准写法,消费 _common/registry.yaml 提供的 imagePullSecrets。
2026-09-10 08:43:57 +00:00
薛佳帆 05a476d932 feat: provision 写入 NM keep-configuration=no——禁止开机收编 initramfs(dracut 遗留 DHCP)抢配的连接,强制按 autoconnect-priority 选路激活静态档案;initrd 的 DHCP 租约以副地址共存(双 IP:静态主+DHCP 副兜底);rollback 对称移除 2026-09-10 16:21:42 +08:00
薛佳帆 9035f9eb96 release: bump chart version to v1.0.17 2026-09-10 08:02:26 +00:00
薛佳帆 869754606e release: bump chart version to v1.0.16 2026-09-10 08:01:59 +00:00
薛佳帆 405eef034a feat(network-agent): 挂载宿主机状态目录 /var/lib/mixingx/network-agent(DirectoryOrCreate)——网卡别名 aliases.json 持久化,节点重启/Pod 重建均保留;chart 1.0.16 2026-09-10 09:47:34 +08:00
王野 9b3a61eb49 release: bump chart version to v1.0.15 2026-09-08 11:25:07 +00:00
ximenchuifeng 322411955e release: bump chart version to v1.0.14 2026-09-08 11:08:11 +00:00
ximenchuifeng 4716a40c3a release: bump chart version to v1.0.13 2026-09-08 11:06:21 +00:00
ximenchuifeng 9ab9b5c97e release: bump chart version to v1.0.12 2026-09-08 11:05:17 +00:00
王野 6707dbe28f release: bump chart version to v1.0.11 2026-09-08 10:57:34 +00:00
ximenchuifeng 8b70d43953 release: bump chart version to v1.0.10 2026-09-08 10:48:09 +00:00
ximenchuifeng 70c85011db release: bump chart version to v1.0.9 2026-09-08 10:28:34 +00:00
王野 34e108dbbc release: bump chart version to v1.0.8 2026-09-08 10:05:38 +00:00
薛佳帆 4395e900e9 refactor(network-agent): 移除 NET_ADMIN capability 与 nm-run 挂载——agent 已无 ip addr del 等网络写操作(切静态清残留动态地址逻辑删除,networkd 将在宿主机 mask),特权动作全部经 D-Bus 由主机 NM 执行;/run/NetworkManager 源码未使用一并移除;chart 1.0.7 2026-09-08 16:20:53 +08:00
ximenchuifeng 0aea949b49 release: bump chart version to v1.0.7 2026-09-08 08:07:59 +00:00
22 changed files with 261 additions and 192 deletions

No files matched your search

+1
View File
@@ -10,6 +10,7 @@ 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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
@@ -0,0 +1,6 @@
apiVersion: v2
name: mixingx-codeserver
description: MixingX code-server — 浏览器版 VS Code 测试 IDE,预装 GitLens/EditorConfig/Prettier/C#/OPC UA Browser 插件。
type: application
version: 1.0.51
appVersion: "1.0.51"
@@ -0,0 +1,12 @@
# 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,无需额外注解。
@@ -0,0 +1,13 @@
{{/*
组件名(默认 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 -}}
@@ -0,0 +1,127 @@
{{- $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
@@ -0,0 +1,25 @@
{{- $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 }}
@@ -0,0 +1,40 @@
# 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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
@@ -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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
@@ -29,6 +29,10 @@ 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" }}
@@ -51,13 +55,10 @@ 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 # 只需 root + D-Bus socket,无需 privileged 与额外 capability:
# NET_ADMIN: 清除切换静态后残留的动态地址(ip addr del 需要此能力) # nmcli 经 D-Bus 操作主机 NM,特权动作(改 IP/路由)全部由 NM 进程执行
runAsUser: 0 runAsUser: 0
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
add:
- NET_ADMIN
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/network/health path: /api/network/health
@@ -80,15 +81,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
- name: nm-run # 网卡别名持久化: aliases.json 落宿主机,重启/重建 Pod 均保留
mountPath: /run/NetworkManager - name: alias-store
readOnly: true mountPath: /var/lib/mixingx/network-agent
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: nm-run - name: alias-store
hostPath: hostPath:
path: /run/NetworkManager path: /var/lib/mixingx/network-agent
type: DirectoryOrCreate type: DirectoryOrCreate
@@ -1,6 +1,8 @@
# 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:
@@ -8,6 +10,8 @@ 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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
@@ -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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
+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.6 version: 1.0.51
appVersion: "1.0.6" appVersion: "1.0.51"
-112
View File
@@ -1,112 +0,0 @@
#!/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
@@ -1,48 +0,0 @@
#!/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/ (可手工清理)"