feat(release): mxlexus 客户环境全套 + _common 共享 values(release 分支首提交)

- environments/_common/registry.yaml: 全客户共享非版本 values(ACR 地址+imagePullSecrets,铁律禁 tag)
- environments/mxlexus/: image-version 钉 v1.0.1(占位,首发由流水线改写)+ 8 个站点 values(第三方镜像显式 ACR 引用,TODO(D3) 标注现场核对项)
- applications/mxlexus/: 5 单应用 + edges/agents ApplicationSet(chart 钉 chart tag,deploy 钉 release,automated+selfHeal+prune 关)
- bootstrap/mixingx-mxlexus-root.yaml: 现场 root app
- RELEASE.md: 分支纪律(ADR-0068)
- 本地 helm 渲染验证:ACR 地址/v1.0.1/imagePullSecrets/IfNotPresent 全部正确
This commit is contained in:
ximenchuifeng committed 2026-08-22 13:11:26 +08:00
1 parent a1a1a617ff
commit 638d1bca8f
20 files changed
+654

No files matched your search

+35
View File
@@ -0,0 +1,35 @@
# release 分支纪律(ADR-0068)
本分支(`release`)是全部客户现场 ArgoCD 的唯一真相源。**平时静止,动即交付。**
## 谁能推
- 只有发布流水线(release-promote,mixingx.deploy 仓库的 Drone 流水线)可以推本分支。
- Gitee 分支保护:白名单 = 发布流水线机器账号,禁止 force push。(首次推送后配置,见改造清单 B1)
## 什么可以改
| 位置 | 谁改 | 怎么改 |
|------|------|--------|
| `environments/<customer>/image-version.yaml` | **仅流水线** | pin 步骤自动钉版 |
| `applications/<customer>/*.yaml` 的 chart targetRevision | **仅流水线** | pin 步骤自动替换 |
| `environments/<customer>/` 其余 values(站点参数) | 人工(走评审) | 直接 commit:密码、DNS、edge 清单等现场配置 |
| `environments/_common/` | 人工(走评审) | **铁律:只放非版本性内容(地址/secret 名/时区),禁止任何镜像 tag**——改这里会同时触发所有客户 |
| 其余一切(master 带来的 demo/dev 等) | **无人** | 只能通过 merge master 进入 |
## 共享变更怎么流
chart 结构/新应用等共享变化:先落 master(demo 验证),发布时流水线 pin 步骤前 `merge master`
(或人工 merge),一次惠及全部客户。
## 升级与回滚
- 升级 = 流水线推本分支 → 各现场 ArgoCD ~3 分钟自动 sync(leaf apps: automated + selfHeal,prune 关)
- 回滚 = revert 本分支上该客户目录的版本 commit → push
- 现场任何人手工 kubectl 的改动,selfHeal 会在几分钟内打回 git 版本
## 多客户演进
新客户 = 复制 `environments/mxlexus/` + `applications/mxlexus/` 为新目录 + `bootstrap/` 加 root app,
零结构改动。出现"某客户停机检修期间分支必须绝对静止"或客户数 >~5 时,再把该客户目录拆成
独立分支(结构不变,ADR-0068 Considered Options)。
+51
View File
@@ -0,0 +1,51 @@
# mxlexus — Agent 单元 ApplicationSet(按 environments/mxlexus/agents.yaml 清单生成)
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: mixingx-mxlexus-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/mxlexus/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.1
path: release-charts/mixingx-agent-unit
helm:
releaseName: 'mixingx-agent-{{ .id }}'
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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 @@
# mxlexus — mixingx-audit(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus / 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.1
path: release-charts/mixingx-audit
helm:
releaseName: mixingx-audit
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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
+55
View File
@@ -0,0 +1,55 @@
# mxlexus — Edge 单元 ApplicationSet(按 environments/mxlexus/edges.yaml 清单生成)
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: mixingx-mxlexus-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/mxlexus/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.1
path: release-charts/mixingx-edge-unit
helm:
releaseName: 'mixingx-edge-{{ .id }}'
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/edge-common-values.yaml
values: |
site: "{{ .id }}"
idWorkerId: {{ .idWorkerId }}
description: "{{ .description }}"
{{- if hasKey . "nodeLabel" }}
nodeSelector:
mixingx.io/edge-node: "{{ .nodeLabel }}"
{{- 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 @@
# mxlexus — mixingx-gateway(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus / 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.1
path: release-charts/mixingx-gateway
helm:
releaseName: mixingx-gateway
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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 @@
# mxlexus — mixingx-infra(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus / 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.1
path: release-charts/mixingx-infra
helm:
releaseName: mixingx-infra
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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
+32
View File
@@ -0,0 +1,32 @@
# mxlexus — mixingx-sso(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus / 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.1
path: release-charts/mixingx-sso
helm:
releaseName: mixingx-sso
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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 @@
# mxlexus — mixingx-ultra(客户环境 Application,ADR-0068)
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus / 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.1
path: release-charts/mixingx-ultra
helm:
releaseName: mixingx-ultra
valueFiles:
- $values/environments/_common/registry.yaml
- $values/environments/mxlexus/image-version.yaml
- $values/environments/mxlexus/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
+24
View File
@@ -0,0 +1,24 @@
# mxlexus 现场 root app(一次性手工 apply,runbook 见改造清单 D3)
#
# 闸门语义(ADR-0068):targetRevision 钉 release 分支——平时静止,仅发布流水线可推;
# path 钉 applications/mxlexus——只感知本目录变化,其他客户互不影响。
apiVersion: argoproj.io/v1alpha1
kind: Application
metadata:
name: mixingx-mxlexus-root
namespace: argocd
spec:
project: default
source:
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
targetRevision: release
path: applications/mxlexus
destination:
server: https://kubernetes.default.svc
namespace: argocd
syncPolicy:
automated:
prune: false
selfHeal: true
syncOptions:
- CreateNamespace=true
+17
View File
@@ -0,0 +1,17 @@
# ═══════════════════════════════════════════════════════════════════
# 全客户共享的非版本性 values(ADR-0068)
#
# 铁律:本目录只放「改了不该有版本含义」的内容(地址、secret 名、时区)。
# 禁止放任何镜像 tag 或会触发滚动的内容——版本永远钉在各客户自己的
# environments/<customer>/image-version.yaml,否则一次修改会同时
# 触发所有客户自动升级。
#
# 每个客户 Application 的 valueFiles 均以本文件开头。
# ═══════════════════════════════════════════════════════════════════
registry: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/mixingx
imagePullSecrets:
- name: mixingx-acr
timezone: Asia/Shanghai
@@ -0,0 +1,40 @@
# mxlexus — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加)
storage:
className: longhorn # TODO(D3): 同 infra-values
size: 5Gi
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 凭据:TODO(D3) 按现场各 edge 的 NanoMQ 实际账号填写
mqttCredentials: []
audit:
publisher:
enabled: true
+10
View File
@@ -0,0 +1,10 @@
# mxlexus — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-<id>)
#
# TODO(D3): 现场确定 agent 单元后填写;phaseType 按产线工艺(如 DieCasting)
# 示例:
# agents:
# - id: mxlexus-line1
# description: 压铸一线 Agent
# phaseType: DieCasting
agents: []
+36
View File
@@ -0,0 +1,36 @@
# mxlexus — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065)
storage:
className: longhorn # TODO(D3): 同 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 @@
# mxlexus — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加)
storage:
className: longhorn # TODO(D3): 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
+11
View File
@@ -0,0 +1,11 @@
# mxlexus — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-<id>)
#
# TODO(D3): 现场确定 edge 单元数量与命名后填写;idWorkerId 全平台唯一(1-63)
# 示例:
# edges:
# - id: mxlexus-line1
# idWorkerId: 21
# description: 压铸一线
# nodeLabel: line1 # 可选:绑定 edge 节点标签
edges: []
+30
View File
@@ -0,0 +1,30 @@
# mxlexus — 网关
#
# ⚠️ 现场核对项(D3):
# - 暴露方式:现场无 *.mixingx.local DNS,ingress 默认关闭;
# D3 时决定暴露方案(gateway-service 改 NodePort,或甲方自备域名/Ingress)
storage:
className: longhorn # TODO(D3): 同 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
ingress:
enabled: false # TODO(D3): 确定现场暴露方案后开启/调整
+40
View File
@@ -0,0 +1,40 @@
# mxlexus 交付版本钉死(ADR-0067)
#
# - registry / imagePullSecrets / timezone 由 environments/_common/registry.yaml 提供,此处不重复
# - 本文件由发布流水线(release-promote 的 pin 步骤)自动改写,禁止手改 tag
# - protocol mock 镜像现场不部署,无对应条目
# - tag 语义:全部镜像钉同一交付版本(交付基线整体晋级,ADR-0067)
tag: v1.0.1
images:
gateway:
repository: gateway
tag: v1.0.1
sso:
repository: sso
tag: v1.0.1
ssoWeb:
repository: sso-web
tag: v1.0.1
ultra:
repository: ultra
tag: v1.0.1
ultraWeb:
repository: ultra-web
tag: v1.0.1
audit:
repository: audit
tag: v1.0.1
edge:
repository: edge
tag: v1.0.1
edgeWeb:
repository: edge-web
tag: v1.0.1
agent:
repository: agent
tag: v1.0.1
agentWeb:
repository: agent-web
tag: v1.0.1
+36
View File
@@ -0,0 +1,36 @@
# mxlexus — 共享基础设施(redis / rabbitmq)
#
# ⚠️ 现场核对项(D3):
# - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认
# - 密码为交付默认值,D3 时可按甲方要求更换
# - otlp:现场无观测栈,留空(OTLP 导出器不启用)
storage:
className: longhorn # TODO(D3): 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
+37
View File
@@ -0,0 +1,37 @@
# mxlexus — SSO(后端 + web + 专属 PostgreSQL)
storage:
className: longhorn # TODO(D3): 同 infra-values
sharedInfra:
postgres:
image: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/postgres:17
username: postgres
password: "Admin12345" # TODO(D3): 可按甲方要求更换
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 @@
# mxlexus — Ultra 看板(后端 + web + 专属 PostgreSQL)
storage:
className: longhorn # TODO(D3): 同 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