新增 mxinit 母盘环境(基于 sanhua 精简:去掉 codeserver 与 agent-postgres-lb;edge idWorkerId=41)

This commit is contained in:
薛佳帆 committed 2026-10-26 11:32:06 +08:00
1 parent 1848eed7b5
commit 48e3801809
23 files changed
+692

No files matched your search

+51
View File
@@ -0,0 +1,51 @@
# mxinit — Agent 单元 ApplicationSet(按 environments/mxinit/agents.yaml 清单生成)
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: mixingx-mxinit-agents
namespace: argocd
spec:
goTemplate: true
goTemplateOptions:
- missingkey=error
generators:
- matrix:
generators:
- git:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
revision: release
files:
- path: environments/mxinit/agents.yaml
- list:
elementsYaml: '{{ .agents | toJson }}'
template:
metadata:
name: 'mixingx-agent-{{ .id }}'
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.81
path: release-charts/mixingx-agent-unit
helm:
releaseName: 'mixingx-agent-{{ .id }}'
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/agent-common-values.yaml
values: |
site: "{{ .id }}"
description: "{{ .description }}"
phaseType: "{{ .phaseType }}"
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+32
View File
@@ -0,0 +1,32 @@
# mxinit — mixingx-audit(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 /
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-audit
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.15
path: release-charts/mixingx-audit
helm:
releaseName: mixingx-audit
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/audit-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+68
View File
@@ -0,0 +1,68 @@
# mxinit — Edge 单元 ApplicationSet(按 environments/mxinit/edges.yaml 清单生成)
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: mixingx-mxinit-edges
namespace: argocd
spec:
goTemplate: true
goTemplateOptions:
- missingkey=error
generators:
- matrix:
generators:
- git:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
revision: release
files:
- path: environments/mxinit/edges.yaml
- list:
elementsYaml: '{{ .edges | toJson }}'
template:
metadata:
name: 'mixingx-edge-{{ .id }}'
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.66
path: release-charts/mixingx-edge-unit
helm:
releaseName: 'mixingx-edge-{{ .id }}'
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/edge-common-values.yaml
values: |
site: "{{ .id }}"
idWorkerId: {{ .idWorkerId }}
description: "{{ .description }}"
{{- if hasKey . "nodeLabel" }}
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- end }}
{{- /* ADS Router 逐实例身份透传(chart 默认 enabled=true):实例缺 adsRouter
身份时不在此兜底,由 chart 渲染守卫明确拒绝。 */ -}}
{{- if hasKey . "adsRouter" }}
adsRouter:
localNetId: "{{ .adsRouter.localNetId }}"
publicAddress: "{{ .adsRouter.publicAddress }}"
{{- if hasKey .adsRouter "clientEndPoint" }}
clientEndPoint: "{{ .adsRouter.clientEndPoint }}"
{{- end }}
{{- if hasKey .adsRouter "externalPort" }}
externalPort: {{ .adsRouter.externalPort }}
{{- end }}
{{- end }}
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+32
View File
@@ -0,0 +1,32 @@
# mxinit — mixingx-gateway(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 /
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-gateway
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.18
path: release-charts/mixingx-gateway
helm:
releaseName: mixingx-gateway
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/gateway-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+32
View File
@@ -0,0 +1,32 @@
# mxinit — mixingx-infra(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 /
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-infra
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.81
path: release-charts/mixingx-infra
helm:
releaseName: mixingx-infra
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/infra-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+29
View File
@@ -0,0 +1,29 @@
# mxinit — MQTTX 调试客户端
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-mqttx
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.81
path: release-charts/mixingx-mqttx
helm:
releaseName: mixingx-mqttx
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/mqttx-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+25
View File
@@ -0,0 +1,25 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-network-agent
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: master
path: release-charts/mixingx-network-agent
helm:
releaseName: mixingx-network-agent
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/network-agent-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
syncOptions:
- CreateNamespace=true
+20
View File
@@ -0,0 +1,20 @@
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mxinit-root
namespace: argocd
spec:
project: default
source:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
path: applications/mxinit
directory:
exclude: "root.yaml"
destination:
server: https://kubernetes.default.svc
namespace: argocd
syncPolicy:
automated:
prune: false
selfHeal: false
+32
View File
@@ -0,0 +1,32 @@
# mxinit — mixingx-sso(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 /
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-sso
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.75
path: release-charts/mixingx-sso
helm:
releaseName: mixingx-sso
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/sso-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+32
View File
@@ -0,0 +1,32 @@
# mxinit — mixingx-ultra(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 /
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-ultra
namespace: argocd
spec:
project: default
sources:
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
targetRevision: chart-v1.0.43
path: release-charts/mixingx-ultra
helm:
releaseName: mixingx-ultra
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxinit/image-version.yaml
- $values/environments/mxinit/ultra-values.yaml
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
ref: values
destination:
server: https://kubernetes.default.svc
namespace: mixingx
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
@@ -0,0 +1,43 @@
# mxinit — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加)
storage:
className: longhorn # TODO: 同 infra-values
size: 200Gi
keep: true
images:
backend:
repository: agent
tag: "" # 留空 → 回退 image-version 的 images.agent.tag
frontend:
repository: agent-web
tag: ""
postgres:
# agent 单元自带 PostgreSQL:显式 ACR 引用(ADR-0066)
repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/postgres
tag: 17
sharedInfra:
postgres:
username: postgres
password: "Admin12345"
port: 5432
redis:
host: redis-service
port: 6379
password: "Admin12345"
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
# MQTT 凭据:对齐 demo 模式(credentialRef = edge-<edgeId>-mqtt;NanoMQ 匿名,账号留空)
mqttCredentials:
- credentialRef: "edge-mxinit-mqtt"
username: ""
password: ""
audit:
publisher:
enabled: true
+6
View File
@@ -0,0 +1,6 @@
# mxinit — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-<id>)
agents:
- id: mxinit
description: mxinit Agent
phaseType: DieCasting
+36
View File
@@ -0,0 +1,36 @@
# mxinit — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065)
storage:
className: longhorn # TODO: 同 infra-values
sharedInfra:
postgres:
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/postgres:17
username: postgres
password: "Admin12345"
port: 5432
otlp:
endpoint: ""
protocol: grpc
audit:
enabled: true
port: 5900
replicas: 1 # 单节点现场,副本收敛为 1
database: audit-db
pgStorage: 5Gi
jwt:
ssoBaseUrl: "http://sso-service:8080"
mqtt:
# audit broker 镜像:显式 ACR 引用(ADR-0066;上游 emqx/nanomq 已收进 library/*)
image: "mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/nanomq:0.25.2-2"
brokerHost: "audit-nanomq-service"
brokerPort: 1883
managementPort: 8081
managementUsername: "admin"
managementPassword: "public"
consume:
queueCapacity: 128
queueMaxWaitMs: 5000
dbWriteTimeoutMs: 3000
concurrency: 4
@@ -0,0 +1,35 @@
# mxinit — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加)
storage:
className: longhorn # TODO: edge 配置存储的 SC;若现场用 local-path 则替换
size: 5Gi
keep: true # Edge 配置存储是权威资产,删除时保留 PVC(ADR-0055 语系)
images:
backend:
repository: edge
tag: "" # 留空 → 回退 image-version.yaml 的 images.edge.tag(钉死 v1.0.x)
frontend:
repository: edge-web
tag: ""
sharedInfra:
redis:
host: redis-service
port: 6379
password: "Admin12345"
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
mqtt:
image:
# 显式 ACR 引用(ADR-0066)
repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/nanomq
tag: 0.25.2-2
audit:
publisher:
enabled: true
+13
View File
@@ -0,0 +1,13 @@
# mxinit — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-<id>)
# idWorkerId 全平台唯一(1-63);demo 占用 17-18,tuopu-01 占用 21-22,sanhua 占 31,mxinit 占 41
edges:
- id: mxinit
idWorkerId: 41
description: mxinit 主 Edge(母盘)
# ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。
# localNetId 第 4 字节与 idWorkerId 对齐便于记忆。
adsRouter:
localNetId: "10.200.0.41.1.1"
# 母盘机 enp1s0f0 当前 DHCP 地址;克隆分发后必须按现场出口源地址更新。
publicAddress: "192.168.1.247"
+33
View File
@@ -0,0 +1,33 @@
# mxinit — 网关
#
# ⚠️ 现场核对项:
# - 暴露方式:现场无 *.mixingx.local DNS,ingress 默认关闭;
# 交付时决定暴露方案(gateway-service 改 NodePort,或甲方自备域名/Ingress)
storage:
className: longhorn # TODO: 同 infra-values
sharedInfra:
redis:
host: redis-service
port: 6379
password: Admin12345
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
otlp:
endpoint: ""
protocol: grpc
gateway:
port: 8080
replicas: 1 # 单节点现场,副本收敛为 1
rbac: true
# 暴露方式:chart 的标准 Ingress 不支持 IP 作 host(K8s 校验拒绝),
# 现场以 Traefik IngressRoute(Host <mxinit 现场 IP>)手工落;
# TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps
ingress:
enabled: false
+35
View File
@@ -0,0 +1,35 @@
tag: v1.0.75
images:
gateway:
repository: gateway
tag: develop-v.1.0.1-202609140639-9
sso:
repository: sso
tag: v1.0.75
ssoWeb:
repository: sso-web
tag: v1.0.75
ultra:
repository: ultra
tag: v1.0.43
ultraWeb:
repository: ultra-web
tag: v1.0.43
audit:
repository: audit
tag: v1.0.15
auditWeb:
repository: audit-web
tag: v1.0.15
edge:
repository: edge
tag: v1.0.66
edgeWeb:
repository: edge-web
tag: v1.0.66
agent:
repository: agent
tag: develop-v.1.0.1-202610230114-178
agentWeb:
repository: agent-web
tag: develop-v.1.0.1-202610230114-178
+36
View File
@@ -0,0 +1,36 @@
# mxinit — 共享基础设施(redis / rabbitmq)
#
# ⚠️ 现场核对项:
# - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认
# - 密码为交付默认值,可按甲方要求更换
# - otlp:现场无观测栈,留空(OTLP 导出器不启用)
storage:
className: longhorn # TODO: kubectl get sc 确认现场 Longhorn SC 名
sharedInfra:
redis:
host: redis-service
port: 6379
password: "Admin12345"
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
otlp:
endpoint: ""
protocol: grpc
# 第三方镜像:显式 ACR 引用(ADR-0066,不依赖透明 mirror)
sharedDatastores:
- name: redis
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/redis:8.6
port: 6379
storage: 2Gi
mountPath: /data
- name: messaging
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/rabbitmq:4.3-management
port: 5672
storage: 2Gi
mountPath: /var/lib/rabbitmq
+19
View File
@@ -0,0 +1,19 @@
# mxinit — MQTTX Web(MQTT 调试客户端)
#
# 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。
# 暴露:Traefik 专用入口 mqttx(:8082,<mxinit 现场 IP>)——IngressRoute 现场手工落,
# chart ingress 关闭(标准 Ingress 不收 IP host,见 gateway-values 同款注释)。
# 连接目标 Edge NanoMQ 的方式:把目标 edge 的 NanoMQ Service 临时改 NodePort 并声明 ws 端口
# (kubectl patch svc edge-mxinit-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:<NodePort>/mqtt
mqttx:
name: mqttx
replicas: 1
description: "MQTT 监控客户端 (mxinit)"
image:
# 显式 ACR 引用(ADR-0066);latest + IfNotPresent:首次拉取后固定,不再漂移
repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/mqttx-web
tag: latest
ingress:
enabled: false # 暴露走 Traefik IngressRoute(:8082),不走 chart Ingress
@@ -0,0 +1,8 @@
# mxinit — network-agent(网卡/Wi-Fi 工具,独立 chart mixingx-network-agent)
# 镜像地址的 registry 由 image-version.yaml 顶层提供(ACR);此处只钉 tag。
image:
tag: develop-v.1.0.1-202609100650-37
authToken: ''
corsOrigins: '*'
rollbackTimeoutSeconds: 60
k3sRestartOnIpChange: true
+1
View File
@@ -0,0 +1 @@
releases: []
+37
View File
@@ -0,0 +1,37 @@
# mxinit — SSO(后端 + web + 专属 PostgreSQL)
storage:
className: longhorn # TODO: 同 infra-values
sharedInfra:
postgres:
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/postgres:17
username: postgres
password: "Admin12345" # TODO: 可按甲方要求更换
port: 5432
redis:
host: redis-service
port: 6379
password: "Admin12345"
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
otlp:
endpoint: ""
protocol: grpc
sso:
name: sso
role: sso
serviceId: sso
database: sso-db
pgStorage: 10Gi
replicas: 1 # 单节点现场,副本收敛为 1
description: "统一登录"
webBasePath: /sso/
audit:
publisher:
enabled: true
+37
View File
@@ -0,0 +1,37 @@
# mxinit — Ultra 看板(后端 + web + 专属 PostgreSQL)
storage:
className: longhorn # TODO: 同 infra-values
sharedInfra:
postgres:
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/postgres:17
username: postgres
password: "Admin12345"
port: 5432
redis:
host: redis-service
port: 6379
password: "Admin12345"
rabbitmq:
host: messaging-service
port: 5672
username: guest
password: guest
otlp:
endpoint: ""
protocol: grpc
ultra:
name: ultra
role: ultra
serviceId: ultra
database: ultra-db
pgStorage: 10Gi
replicas: 1 # 单节点现场,副本收敛为 1
description: "Ultra 看板"
webBasePath: /ultra/
audit:
publisher:
enabled: true