Compare commits
40
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ada89158fa | ||
|
|
c3f27ee62b | ||
|
|
b8659270e6 | ||
|
|
bd0f20af0b | ||
|
|
ef0e2b5ce1 | ||
|
|
e6ada86374 | ||
|
|
33908b6955 | ||
|
|
f623c56853 | ||
|
|
1a1847ba7e | ||
|
|
c698fe14cc | ||
|
|
ee378168c0 | ||
|
|
41ccb587a9 | ||
|
|
84ddff1776 | ||
|
|
02583981cb | ||
|
|
bfec34fc70 | ||
|
|
b42271b704 | ||
|
|
3decc0f1a2 | ||
|
|
3bc2c6a1b4 | ||
|
|
1632267279 | ||
|
|
51123401a1 | ||
|
|
04e0105b91 | ||
|
|
3c5dff3857 | ||
|
|
cf0cf6080f | ||
|
|
e5bf7090b4 | ||
|
|
943b045cad | ||
|
|
e988974374 | ||
|
|
224afb71f1 | ||
|
|
981be3e23f | ||
|
|
4613388d0c | ||
|
|
2ba8f83f2e | ||
|
|
0ece6b12b2 | ||
|
|
b6c35f28e3 | ||
|
|
d4b84bb886 | ||
|
|
05a476d932 | ||
|
|
9035f9eb96 | ||
|
|
869754606e | ||
|
|
405eef034a | ||
|
|
9b3a61eb49 | ||
|
|
322411955e | ||
|
|
4716a40c3a |
No files matched your search
@@ -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.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-audit
|
||||
description: MixingX audit service.
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -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.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-gateway
|
||||
description: MixingX gateway service, RBAC, and root ingress.
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-infra
|
||||
description: MixingX shared infrastructure services (Redis, MongoDB, RabbitMQ).
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-mqttx
|
||||
description: MixingX MQTTX Web — 浏览器端 MQTT 客户端,用于监控/调试各 Edge 的 NanoMQ broker。
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-network-agent
|
||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -29,6 +29,10 @@ spec:
|
||||
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" }}
|
||||
@@ -77,8 +81,15 @@ spec:
|
||||
# 主机 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
|
||||
@@ -1,6 +1,8 @@
|
||||
# Headless 诊断服务: DNS network-agent 返回各节点 agent 的全部地址。
|
||||
# 注意: 每个 agent 只管理自己所在节点,不要用普通 ClusterIP Service 访问
|
||||
# (会在节点间随机负载均衡导致操作到错误的主机)。前端弹窗始终直连节点 IP。
|
||||
# mixingx.io/role 标签让 Gateway 发现该服务并生成 /api/network/** 透传路由,
|
||||
# 前端网络设置弹窗经 Gateway 同源转发访问(消除跨域)。
|
||||
apiVersion: v1
|
||||
kind: Service
|
||||
metadata:
|
||||
@@ -8,6 +10,8 @@ metadata:
|
||||
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:
|
||||
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-platform
|
||||
description: MixingX central platform services without customer edge/agent instances.
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -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.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -2,5 +2,5 @@ apiVersion: v2
|
||||
name: mixingx-sso
|
||||
description: MixingX SSO standalone release (backend, web, and PostgreSQL).
|
||||
type: application
|
||||
version: 1.0.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -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.12
|
||||
appVersion: "1.0.12"
|
||||
version: 1.0.45
|
||||
appVersion: "1.0.45"
|
||||
@@ -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"
|
||||
@@ -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/ (可手工清理)"
|
||||
Reference in new issue
Block a user