From b0c01c04db61b9468644e802ed5bf8439ddc5548 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Tue, 27 Oct 2026 14:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20mxlexus2=20=E7=8E=AF?= =?UTF-8?q?=E5=A2=83(=E7=AC=AC=E4=BA=8C=E5=8F=B0=20lexus=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87):applications/mxlexus2=20+=20environments/mxlexus2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 以 mxlexus 为模板,idWorkerId=22,ADS localNetId 10.200.0.22.1.1 - publicAddress 暂填办公室占位 192.168.1.233(TODO 现场实测后替换) - chart 钉与 mxlexus 现值一致 --- applications/mxlexus2/agents.yaml | 51 ++++ applications/mxlexus2/audit.yaml | 32 +++ applications/mxlexus2/edges.yaml | 68 +++++ applications/mxlexus2/gateway.yaml | 32 +++ applications/mxlexus2/infra.yaml | 32 +++ applications/mxlexus2/mqttx.yaml | 29 ++ applications/mxlexus2/network-agent.yaml | 25 ++ applications/mxlexus2/root.yaml | 20 ++ applications/mxlexus2/sso.yaml | 32 +++ applications/mxlexus2/ultra.yaml | 32 +++ .../mxlexus2/agent-common-values.yaml | 43 +++ environments/mxlexus2/agents.yaml | 6 + environments/mxlexus2/audit-values.yaml | 36 +++ environments/mxlexus2/edge-common-values.yaml | 35 +++ environments/mxlexus2/edges.yaml | 13 + environments/mxlexus2/gateway-values.yaml | 33 +++ environments/mxlexus2/image-version.yaml | 35 +++ environments/mxlexus2/infra-values.yaml | 36 +++ environments/mxlexus2/mqttx-values.yaml | 19 ++ .../mxlexus2/network-agent-values.yaml | 8 + environments/mxlexus2/release-notes.yaml | 249 ++++++++++++++++++ environments/mxlexus2/sso-values.yaml | 37 +++ environments/mxlexus2/ultra-values.yaml | 37 +++ 23 files changed, 940 insertions(+) create mode 100644 applications/mxlexus2/agents.yaml create mode 100644 applications/mxlexus2/audit.yaml create mode 100644 applications/mxlexus2/edges.yaml create mode 100644 applications/mxlexus2/gateway.yaml create mode 100644 applications/mxlexus2/infra.yaml create mode 100644 applications/mxlexus2/mqttx.yaml create mode 100644 applications/mxlexus2/network-agent.yaml create mode 100644 applications/mxlexus2/root.yaml create mode 100644 applications/mxlexus2/sso.yaml create mode 100644 applications/mxlexus2/ultra.yaml create mode 100644 environments/mxlexus2/agent-common-values.yaml create mode 100644 environments/mxlexus2/agents.yaml create mode 100644 environments/mxlexus2/audit-values.yaml create mode 100644 environments/mxlexus2/edge-common-values.yaml create mode 100644 environments/mxlexus2/edges.yaml create mode 100644 environments/mxlexus2/gateway-values.yaml create mode 100644 environments/mxlexus2/image-version.yaml create mode 100644 environments/mxlexus2/infra-values.yaml create mode 100644 environments/mxlexus2/mqttx-values.yaml create mode 100644 environments/mxlexus2/network-agent-values.yaml create mode 100644 environments/mxlexus2/release-notes.yaml create mode 100644 environments/mxlexus2/sso-values.yaml create mode 100644 environments/mxlexus2/ultra-values.yaml diff --git a/applications/mxlexus2/agents.yaml b/applications/mxlexus2/agents.yaml new file mode 100644 index 0000000..fe3ea49 --- /dev/null +++ b/applications/mxlexus2/agents.yaml @@ -0,0 +1,51 @@ +# mxlexus2 — Agent 单元 ApplicationSet(按 environments/mxlexus2/agents.yaml 清单生成) +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-mxlexus2-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/mxlexus2/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.73 + path: release-charts/mixingx-agent-unit + helm: + releaseName: 'mixingx-agent-{{ .id }}' + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/audit.yaml b/applications/mxlexus2/audit.yaml new file mode 100644 index 0000000..692cc67 --- /dev/null +++ b/applications/mxlexus2/audit.yaml @@ -0,0 +1,32 @@ +# mxlexus2 — mixingx-audit(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus2 / 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/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/edges.yaml b/applications/mxlexus2/edges.yaml new file mode 100644 index 0000000..d678ca1 --- /dev/null +++ b/applications/mxlexus2/edges.yaml @@ -0,0 +1,68 @@ +# mxlexus2 — Edge 单元 ApplicationSet(按 environments/mxlexus2/edges.yaml 清单生成) +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-mxlexus2-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/mxlexus2/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/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/gateway.yaml b/applications/mxlexus2/gateway.yaml new file mode 100644 index 0000000..1bc7162 --- /dev/null +++ b/applications/mxlexus2/gateway.yaml @@ -0,0 +1,32 @@ +# mxlexus2 — mixingx-gateway(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus2 / 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/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/infra.yaml b/applications/mxlexus2/infra.yaml new file mode 100644 index 0000000..e7910d1 --- /dev/null +++ b/applications/mxlexus2/infra.yaml @@ -0,0 +1,32 @@ +# mxlexus2 — mixingx-infra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus2 / 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.73 + path: release-charts/mixingx-infra + helm: + releaseName: mixingx-infra + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/mqttx.yaml b/applications/mxlexus2/mqttx.yaml new file mode 100644 index 0000000..1b7c2e8 --- /dev/null +++ b/applications/mxlexus2/mqttx.yaml @@ -0,0 +1,29 @@ +# mxlexus2 — MQTTX 调试客户端(暴露:经 tailscale http://100.64.0.17:8082;终配后改企业网地址) +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.73 + path: release-charts/mixingx-mqttx + helm: + releaseName: mixingx-mqttx + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/network-agent.yaml b/applications/mxlexus2/network-agent.yaml new file mode 100644 index 0000000..60bea38 --- /dev/null +++ b/applications/mxlexus2/network-agent.yaml @@ -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/mxlexus2/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 diff --git a/applications/mxlexus2/root.yaml b/applications/mxlexus2/root.yaml new file mode 100644 index 0000000..70ffd85 --- /dev/null +++ b/applications/mxlexus2/root.yaml @@ -0,0 +1,20 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: mxlexus2-root + namespace: argocd +spec: + project: default + source: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: release + path: applications/mxlexus2 + directory: + exclude: "root.yaml" + destination: + server: https://kubernetes.default.svc + namespace: argocd + syncPolicy: + automated: + prune: false + selfHeal: false diff --git a/applications/mxlexus2/sso.yaml b/applications/mxlexus2/sso.yaml new file mode 100644 index 0000000..944e1e6 --- /dev/null +++ b/applications/mxlexus2/sso.yaml @@ -0,0 +1,32 @@ +# mxlexus2 — mixingx-sso(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus2 / 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.51 + path: release-charts/mixingx-sso + helm: + releaseName: mixingx-sso + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/applications/mxlexus2/ultra.yaml b/applications/mxlexus2/ultra.yaml new file mode 100644 index 0000000..4830d47 --- /dev/null +++ b/applications/mxlexus2/ultra.yaml @@ -0,0 +1,32 @@ +# mxlexus2 — mixingx-ultra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxlexus2 / 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/mxlexus2/image-version.yaml + - $values/environments/mxlexus2/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 diff --git a/environments/mxlexus2/agent-common-values.yaml b/environments/mxlexus2/agent-common-values.yaml new file mode 100644 index 0000000..9e9a0cf --- /dev/null +++ b/environments/mxlexus2/agent-common-values.yaml @@ -0,0 +1,43 @@ +# mxlexus2 — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) + +storage: + className: longhorn # TODO(D3): 同 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--mqtt;NanoMQ 匿名,账号留空) +mqttCredentials: + - credentialRef: "edge-mxlexus2-mqtt" + username: "" + password: "" + +audit: + publisher: + enabled: true diff --git a/environments/mxlexus2/agents.yaml b/environments/mxlexus2/agents.yaml new file mode 100644 index 0000000..1958777 --- /dev/null +++ b/environments/mxlexus2/agents.yaml @@ -0,0 +1,6 @@ +# mxlexus2 — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) + +agents: + - id: mxlexus2 + description: mxlexus2 Agent + phaseType: DieCasting diff --git a/environments/mxlexus2/audit-values.yaml b/environments/mxlexus2/audit-values.yaml new file mode 100644 index 0000000..31273b4 --- /dev/null +++ b/environments/mxlexus2/audit-values.yaml @@ -0,0 +1,36 @@ +# mxlexus2 — 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 diff --git a/environments/mxlexus2/edge-common-values.yaml b/environments/mxlexus2/edge-common-values.yaml new file mode 100644 index 0000000..ed89469 --- /dev/null +++ b/environments/mxlexus2/edge-common-values.yaml @@ -0,0 +1,35 @@ +# mxlexus2 — 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 diff --git a/environments/mxlexus2/edges.yaml b/environments/mxlexus2/edges.yaml new file mode 100644 index 0000000..0424bda --- /dev/null +++ b/environments/mxlexus2/edges.yaml @@ -0,0 +1,13 @@ +# mxlexus2 — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-) +# idWorkerId 全平台唯一(1-63);demo 占用 17-18,mxlexus 占 21,mxlexus2 占 22 + +edges: + - id: mxlexus2 + idWorkerId: 22 + description: mxlexus2 主 Edge + # ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。 + # localNetId 第 4 字节与 idWorkerId 对齐便于记忆(22);10.200.0.x 前缀避开常见 PLC 网段。 + adsRouter: + localNetId: "10.200.0.22.1.1" + # 本地址=节点 PLC 口静态 IP(现场 ip route get 的 src)。 + publicAddress: "192.168.1.233" # TODO 现场实测后替换(现为办公室占位) diff --git a/environments/mxlexus2/gateway-values.yaml b/environments/mxlexus2/gateway-values.yaml new file mode 100644 index 0000000..610d3e8 --- /dev/null +++ b/environments/mxlexus2/gateway-values.yaml @@ -0,0 +1,33 @@ +# mxlexus2 — 网关 +# +# ⚠️ 现场核对项(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 + +# 暴露方式:chart 的标准 Ingress 不支持 IP 作 host(K8s 校验拒绝), +# 现场以 Traefik IngressRoute(Host 192.168.1.233)手工落,见改造清单 D5; +# TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps +ingress: + enabled: false diff --git a/environments/mxlexus2/image-version.yaml b/environments/mxlexus2/image-version.yaml new file mode 100644 index 0000000..0603cf9 --- /dev/null +++ b/environments/mxlexus2/image-version.yaml @@ -0,0 +1,35 @@ +tag: v1.0.67 +images: + gateway: + repository: gateway + tag: develop-v.1.0.1-202609140639-9 + sso: + repository: sso + tag: develop-v.1.0.1-202609300715-103 + ssoWeb: + repository: sso-web + tag: develop-v.1.0.1-202609300715-103 + 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-202610140846-167 + agentWeb: + repository: agent-web + tag: develop-v.1.0.1-202610140846-167 diff --git a/environments/mxlexus2/infra-values.yaml b/environments/mxlexus2/infra-values.yaml new file mode 100644 index 0000000..530f465 --- /dev/null +++ b/environments/mxlexus2/infra-values.yaml @@ -0,0 +1,36 @@ +# mxlexus2 — 共享基础设施(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 diff --git a/environments/mxlexus2/mqttx-values.yaml b/environments/mxlexus2/mqttx-values.yaml new file mode 100644 index 0000000..28be638 --- /dev/null +++ b/environments/mxlexus2/mqttx-values.yaml @@ -0,0 +1,19 @@ +# mxlexus2 — MQTTX Web(MQTT 调试客户端) +# +# 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。 +# 暴露:http://192.168.1.233:8082(Traefik 专用入口 mqttx;标准 Ingress 不收 IP host, +# 见 gateway-values 同款注释)——IngressRoute 现场手工落,chart ingress 关闭。 +# 连接目标 Edge NanoMQ 的方式:把目标 edge 的 NanoMQ Service 临时改 NodePort 并声明 ws 端口 +# (kubectl patch svc edge-mxlexus2-nanomq-service -p ...),MQTTX 里填 ws://192.168.1.233:/mqtt + +mqttx: + name: mqttx + replicas: 1 + description: "MQTT 监控客户端 (mxlexus2)" + 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 diff --git a/environments/mxlexus2/network-agent-values.yaml b/environments/mxlexus2/network-agent-values.yaml new file mode 100644 index 0000000..9b70296 --- /dev/null +++ b/environments/mxlexus2/network-agent-values.yaml @@ -0,0 +1,8 @@ +# mxlexus2 — 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 diff --git a/environments/mxlexus2/release-notes.yaml b/environments/mxlexus2/release-notes.yaml new file mode 100644 index 0000000..0e793e6 --- /dev/null +++ b/environments/mxlexus2/release-notes.yaml @@ -0,0 +1,249 @@ +releases: +- date: '2026-09-21T19:30:52+08:00' + operator: admin + notes: xjf发布 + services: + - name: agent + action: pin-acr + from: v1.0.6 + to: develop-v.1.0.1-202609211125-128 + sourceTag: develop-v.1.0.1-202609211125-128 + digest: '' + dbChange: false +- date: '2026-09-10T16:02:01+08:00' + operator: admin + notes: 哈哈 + services: + - name: sso + action: pin-acr + from: develop-v.1.0.1-202607080208-49 + to: develop-v.1.0.1-202609100552-89 + sourceTag: develop-v.1.0.1-202609100552-89 + digest: '' + dbChange: false + - name: wifi + action: pin-acr + from: latest + to: develop-v.1.0.1-202609100650-37 + sourceTag: develop-v.1.0.1-202609100650-37 + digest: '' + dbChange: false +- date: '2026-09-08T19:06:23+08:00' + operator: admin + notes: q q + services: + - name: gateway + action: pin-acr + from: v1.0.12 + to: v1.0.12 + sourceTag: v1.0.12 + digest: '' + dbChange: false +- date: '2026-09-08T19:05:20+08:00' + operator: admin + notes: 更新gateway + services: + - name: gateway + action: ci-now + from: develop-v.1.0.1-202607080208-49 + to: v1.0.12 + sourceTag: develop-v.1.0.1-202609081104-8 + digest: sha256:1f64ad4c3e01f9bfd14eb04f6b7267b09dd8544c16e11cdbb00b1ab0f0bc1f8a + dbChange: false +- date: '2026-09-08T16:08:01+08:00' + operator: admin + notes: 修复 audit-web 钉版悬空(账本 -53 镜像从未存在于 ACR):audit 前后端交付 v1.0.7(demo 已验证 -15) + services: + - name: audit + action: deliver + from: develop-v.1.0.1-202607080730-53 + to: v1.0.7 + sourceTag: develop-v.1.0.1-202609080325-15 + digest: sha256:f48c37902b116af305b3f8aba221c237403fcc5909121660756dd04ff934c3b3 + dbChange: false +- date: '2026-09-08T15:16:10+08:00' + operator: admin + notes: 但是 + services: + - name: gateway + action: pin-acr + from: develop-v.1.0.1-202607080730-53 + to: develop-v.1.0.1-202607080208-49 + sourceTag: develop-v.1.0.1-202607080208-49 + digest: '' + dbChange: false + - name: sso + action: pin-acr + from: develop-v.1.0.1-202607080730-53 + to: develop-v.1.0.1-202607080208-49 + sourceTag: develop-v.1.0.1-202607080208-49 + digest: '' + dbChange: false + - name: ultra + action: ci-now + from: develop-v.1.0.1-202607080730-53 + to: v1.0.6 + sourceTag: develop-v.1.0.1-202609080712-48 + digest: sha256:3b6fae3c30b235b2b74ec52af219cab0e6970118c92613714bb915452ab76a54 + dbChange: false + - name: agent + action: ci-now + from: develop-v.1.0.1-202609070951-100 + to: v1.0.6 + sourceTag: develop-v.1.0.1-202609080713-102 + digest: sha256:591bd881a9109cb34acd4213fd525f81f553f1f134af2ca915f05a52dfab0579 + dbChange: false + - name: wifi + action: pin-acr + from: latest + to: latest + sourceTag: latest + digest: '' + dbChange: false + - name: mqttx + action: pin-acr + from: latest + to: latest + sourceTag: latest + digest: '' + dbChange: false + component: true + - name: nanomq + action: pin-acr + from: 0.25.2-2 / 0.25.2-2 + to: 0.25.2-2 + sourceTag: 0.25.2-2 + digest: '' + dbChange: false + component: true +- date: '2026-09-08T15:03:02+08:00' + operator: admin + notes: 阿水淀粉 + services: + - name: mqttx + action: pin-acr + from: latest + to: latest + sourceTag: latest + digest: '' + dbChange: false + component: true + - name: nanomq + action: pin-acr + from: 0.25.2-2 / 0.25.2-2 + to: 0.25.2-2 + sourceTag: 0.25.2-2 + digest: '' + dbChange: false + component: true + - name: postgres + action: pin-acr + from: 17 / 17 / 17 / 17 + to: '17' + sourceTag: '17' + digest: '' + dbChange: false + component: true + - name: rabbitmq + action: pin-acr + from: 4.3-management + to: 4.3-management + sourceTag: 4.3-management + digest: '' + dbChange: false + component: true + - name: redis + action: pin-acr + from: '8.6' + to: '8.6' + sourceTag: '8.6' + digest: '' + dbChange: false + component: true +- date: '2026-09-08T14:58:43+08:00' + operator: admin + notes: 发发发 + services: + - name: wifi + action: pin-acr + from: develop-v.1.0.1-202609080530-26 + to: latest + sourceTag: latest + digest: '' + dbChange: false +- date: '2026-09-08T13:48:14+08:00' + operator: admin + notes: dasds + services: [] +- date: '2026-09-08T12:55:54+08:00' + operator: admin + notes: 啊发送 + services: + - name: gateway + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202607080730-53 + sourceTag: develop-v.1.0.1-202607080730-53 + digest: '' + dbChange: false + - name: sso + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202607080730-53 + sourceTag: develop-v.1.0.1-202607080730-53 + digest: '' + dbChange: false + - name: ultra + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202607080730-53 + sourceTag: develop-v.1.0.1-202607080730-53 + digest: '' + dbChange: false + - name: audit + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202607080730-53 + sourceTag: develop-v.1.0.1-202607080730-53 + digest: '' + dbChange: false + - name: agent + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202609070951-100 + sourceTag: develop-v.1.0.1-202609070951-100 + digest: '' + dbChange: false + - name: edge + action: pin-acr + from: v1.0.1 + to: develop-v.1.0.1-202607080730-53 + sourceTag: develop-v.1.0.1-202607080730-53 + digest: '' + dbChange: false +- date: '2026-09-08T12:53:49+08:00' + operator: admin + notes: pin-acr 链路验证:sso 重钉 v1.0.1 原值(镜像不变,chart 前进) + services: + - name: sso + action: pin-acr + from: v1.0.1 + to: v1.0.1 + sourceTag: v1.0.1 + digest: '' + dbChange: false +- date: '2026-09-08T11:23:46+08:00' + operator: admin + notes: 发布链路验证:全 keep 空操作(仅记两本账,不动镜像与现场) + services: [] +- date: '2026-08-27T14:56:38+08:00' + operator: ximenchuifeng + notes: 链路验证 + services: + - name: sso + action: reuse + from: v1.0.1 + to: v1.0.1 + sourceTag: '' + digest: '' + dbChange: false diff --git a/environments/mxlexus2/sso-values.yaml b/environments/mxlexus2/sso-values.yaml new file mode 100644 index 0000000..bac2a0e --- /dev/null +++ b/environments/mxlexus2/sso-values.yaml @@ -0,0 +1,37 @@ +# mxlexus2 — 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 diff --git a/environments/mxlexus2/ultra-values.yaml b/environments/mxlexus2/ultra-values.yaml new file mode 100644 index 0000000..d65719f --- /dev/null +++ b/environments/mxlexus2/ultra-values.yaml @@ -0,0 +1,37 @@ +# mxlexus2 — 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