Compare commits
127
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
42c0789c25 | ||
|
|
73842a7be3 | ||
|
|
0afaa17112 | ||
|
|
bf0170aa26 | ||
|
|
dcc948188b | ||
|
|
78b9b9db15 | ||
|
|
2df3373304 | ||
|
|
9b002c6491 | ||
|
|
6df5affe17 | ||
|
|
bf915935ea | ||
|
|
6734c2022b | ||
|
|
60356c55aa | ||
|
|
68bccfc092 | ||
|
|
e031d656a0 | ||
|
|
347180d77b | ||
|
|
9fdb306601 | ||
|
|
c3e295494d | ||
|
|
17a186a9df | ||
|
|
321b602905 | ||
|
|
a1da3f4e42 | ||
|
|
8733595824 | ||
|
|
ff5ecf710e | ||
|
|
c2b78f8ff0 | ||
|
|
b0e1dcd4f0 | ||
|
|
e7f4b71cd0 | ||
|
|
4bcf4fe0a3 | ||
|
|
33de837556 | ||
|
|
b1d65fab30 | ||
|
|
25a9385751 | ||
|
|
0c8effe321 | ||
|
|
0aeb301be5 | ||
|
|
2892f80bd1 | ||
|
|
2b3bcbcfa8 | ||
|
|
cd3635643b | ||
|
|
326236b5e6 | ||
|
|
133c032144 | ||
|
|
373c020fc4 | ||
|
|
5d54a3ef92 | ||
|
|
ff458a86be | ||
|
|
3345c257c4 | ||
|
|
869cc95c8b | ||
|
|
58ae4560a7 | ||
|
|
6dd26e9549 | ||
|
|
c39195c610 | ||
|
|
52622e8fea | ||
|
|
9cb242aff8 | ||
|
|
77a743cd6c | ||
|
|
443ada9f4a | ||
|
|
d0c054acc8 | ||
|
|
0e5bd063cc | ||
|
|
ec7a42ccc5 | ||
|
|
5f70e78927 | ||
|
|
bac3af555e | ||
|
|
e16a64439b | ||
|
|
673ac6aa6f | ||
|
|
7bd4d58a6d | ||
|
|
7944c98fdb | ||
|
|
50b47a556a | ||
|
|
60c8b4d90e | ||
|
|
22fd52f20f | ||
|
|
7d1bc2d90c | ||
|
|
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 | ||
|
|
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,存量备用
|
||||
@@ -10,6 +10,7 @@ This directory contains the release-oriented charts for Phase 1 ownership split:
|
||||
- `mixingx-edge-unit`: one edge site release.
|
||||
- `mixingx-agent-unit`: one agent site release.
|
||||
- `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.
|
||||
|
||||
The chart at the repository root is kept as a legacy all-in-one chart during migration.
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -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
|
||||
|
||||
@@ -38,6 +38,9 @@ spec:
|
||||
{{ $backendTag := $agentImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.ports.backend }}
|
||||
@@ -103,7 +106,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 }}"
|
||||
@@ -212,8 +215,17 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||
securityContext:
|
||||
runAsUser: 999
|
||||
runAsGroup: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
command: ["docker-entrypoint.sh", "postgres"]
|
||||
securityContext:
|
||||
privileged: true
|
||||
image: {{ .Values.images.postgres.repository }}:{{ .Values.images.postgres.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -36,8 +36,17 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||
securityContext:
|
||||
runAsUser: 999
|
||||
runAsGroup: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
command: ["docker-entrypoint.sh", "postgres"]
|
||||
securityContext:
|
||||
privileged: true
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
|
||||
@@ -46,9 +46,12 @@ spec:
|
||||
key: AUDIT_PG_URI
|
||||
- name: AUDIT_PG_TIMEZONE
|
||||
value: "{{ $root.Values.timezone | default "Asia/Shanghai" }}"
|
||||
# 数据保留月数(按自然月清理分区)
|
||||
# 数据保留月数(按自然月清理分区;operations 表)
|
||||
- name: AUDIT_RETENTION_MONTHS
|
||||
value: "{{ .Values.audit.retentionMonths | default 6 }}"
|
||||
# 错误流水独立保留月数(errors 表,分表独立清除)
|
||||
- name: AUDIT_ERROR_RETENTION_MONTHS
|
||||
value: "{{ .Values.audit.errorRetentionMonths | default 3 }}"
|
||||
# MQTT broker
|
||||
- name: AUDIT_MQTT_BROKER_URL
|
||||
value: "mqtt://{{ .Values.audit.mqtt.brokerHost }}:{{ .Values.audit.mqtt.brokerPort }}"
|
||||
|
||||
@@ -24,8 +24,10 @@ audit:
|
||||
replicas: 2
|
||||
database: audit-db
|
||||
pgStorage: 5Gi
|
||||
# 数据保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
|
||||
# 操作流水(audit_operations)保留月数,按完整自然月清理分区(后端 AUDIT_RETENTION_MONTHS)
|
||||
retentionMonths: 6
|
||||
# 错误流水(audit_errors)独立保留月数(后端 AUDIT_ERROR_RETENTION_MONTHS,2026-10-26 裁决:分表独立)
|
||||
errorRetentionMonths: 3
|
||||
# JWT 鉴权:后端通过 SSO /api/sso/users/info 间接校验 token,这里配置 SSO base URL
|
||||
jwt:
|
||||
ssoBaseUrl: "http://sso-service:8080"
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -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,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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -14,5 +14,25 @@ helm upgrade --install mixingx-edge-workshop-a ./charts/mixingx-edge-unit \
|
||||
--set site=workshop-a \
|
||||
--set nodeName=edge-node-01 \
|
||||
--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,6 +3,10 @@
|
||||
{{- $serviceId := include "mixingx-unit.serviceId" . -}}
|
||||
{{- $basePath := include "mixingx-unit.basePath" . -}}
|
||||
{{- $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
|
||||
kind: PersistentVolumeClaim
|
||||
metadata:
|
||||
@@ -67,6 +71,9 @@ spec:
|
||||
{{ $backendTag := $edgeImg.tag | default $backendImg.tag | default .Values.tag | default "latest" }}
|
||||
image: {{ .Values.registry }}/{{ $backendRepo }}:{{ $backendTag }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.ports.backend }}
|
||||
@@ -87,6 +94,21 @@ spec:
|
||||
value: {{ required "idWorkerId is required for an Edge unit" .Values.idWorkerId | quote }}
|
||||
- name: EdgeSecrets__Root
|
||||
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:
|
||||
- name: edge-data
|
||||
mountPath: /var/lib/mixingx-edge
|
||||
|
||||
@@ -41,6 +41,16 @@ edgeSecrets:
|
||||
nodeName: ""
|
||||
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。
|
||||
# enabled=false 时服务内 AuditMqttPublisher 退化为 NoOp,不发审计事件。
|
||||
# instanceId/nodeId 默认取单元名(role-site,如 edge-demo)。
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -34,6 +34,9 @@ spec:
|
||||
- name: gateway
|
||||
image: {{ .Values.registry }}/{{ $gatewayImage.repository | default "gateway" }}:{{ $gatewayImage.tag | default .Values.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ .Values.gateway.port | default 8080 }}
|
||||
|
||||
@@ -9,7 +9,9 @@ metadata:
|
||||
spec:
|
||||
ingressClassName: traefik
|
||||
rules:
|
||||
- host: {{ .Values.ingress.domain }}
|
||||
- {{- if .Values.ingress.domain }}
|
||||
host: {{ .Values.ingress.domain }}
|
||||
{{- end }}
|
||||
http:
|
||||
paths:
|
||||
- path: /
|
||||
|
||||
@@ -34,6 +34,7 @@ gateway:
|
||||
|
||||
ingress:
|
||||
enabled: true
|
||||
# domain 留空 = 渲染不带 host 的规则,现场 PC 可直接用节点 IP 访问(如 http://192.168.137.117/)
|
||||
domain: app.mixingx.local
|
||||
gatewayService: gateway-service
|
||||
gatewayPort: 8080
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -0,0 +1,6 @@
|
||||
apiVersion: v2
|
||||
name: mixingx-network-agent
|
||||
description: "MixingX network console agent: 每节点常驻,提供主机网口(IP/掩码/网关/DNS)与 WiFi 的可视化配置 API。"
|
||||
type: application
|
||||
version: 1.0.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -33,6 +33,9 @@ spec:
|
||||
- name: {{ .name }}
|
||||
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ $port }}
|
||||
|
||||
@@ -218,8 +218,17 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||
securityContext:
|
||||
runAsUser: 999
|
||||
runAsGroup: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
command: ["docker-entrypoint.sh", "postgres"]
|
||||
securityContext:
|
||||
privileged: true
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -36,6 +36,9 @@ spec:
|
||||
- name: {{ $name }}
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.sso.repository | default "sso" }}:{{ $root.Values.images.sso.tag | default $root.Values.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ $backendPort }}
|
||||
@@ -202,8 +205,17 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||
securityContext:
|
||||
runAsUser: 999
|
||||
runAsGroup: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
command: ["docker-entrypoint.sh", "postgres"]
|
||||
securityContext:
|
||||
privileged: true
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
|
||||
@@ -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.100
|
||||
appVersion: "1.0.100"
|
||||
@@ -41,6 +41,9 @@ spec:
|
||||
- name: {{ $name }}
|
||||
image: {{ $root.Values.registry }}/{{ $root.Values.images.ultra.repository | default "ultra" }}:{{ $root.Values.images.ultra.tag | default $root.Values.tag | default "latest" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
securityContext:
|
||||
appArmorProfile:
|
||||
type: Unconfined
|
||||
ports:
|
||||
- name: http
|
||||
containerPort: {{ $port }}
|
||||
@@ -205,8 +208,17 @@ spec:
|
||||
imagePullSecrets:
|
||||
{{- toYaml . | nindent 8 }}
|
||||
{{- end }}
|
||||
# postgres 以专用用户直跑,绕过镜像内 gosu(新内核下 gosu 用户态死循环,
|
||||
# 见工单:kernel 7.0.0-39+ × gosu 兼容 bug;三件套缺一不可)
|
||||
securityContext:
|
||||
runAsUser: 999
|
||||
runAsGroup: 999
|
||||
fsGroup: 999
|
||||
containers:
|
||||
- name: postgres
|
||||
command: ["docker-entrypoint.sh", "postgres"]
|
||||
securityContext:
|
||||
privileged: true
|
||||
image: {{ $root.Values.sharedInfra.postgres.image | default "docker.io/library/postgres:17" }}
|
||||
imagePullPolicy: IfNotPresent
|
||||
env:
|
||||
|
||||
Reference in new issue
Block a user