From c064fdeb7c29c60f529e3c16bf5c972168c58427 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Tue, 29 Sep 2026 09:33:24 +0800 Subject: [PATCH] =?UTF-8?q?release:=20=E6=96=B0=E5=A2=9E=20thai=20?= =?UTF-8?q?=E7=8E=AF=E5=A2=83(=E5=8F=82=E8=80=83=20sanhua,edge=20workerId?= =?UTF-8?q?=2051,agent=20=E7=9B=98=2050Gi=20=E9=80=82=E9=85=8D=E5=B0=8F?= =?UTF-8?q?=E7=9B=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/thai/agent-postgres-lb.yaml | 21 +++++++ applications/thai/agents.yaml | 51 +++++++++++++++++ applications/thai/audit.yaml | 32 +++++++++++ applications/thai/edges.yaml | 55 +++++++++++++++++++ applications/thai/gateway.yaml | 32 +++++++++++ applications/thai/infra.yaml | 32 +++++++++++ applications/thai/mqttx.yaml | 29 ++++++++++ applications/thai/network-agent.yaml | 25 +++++++++ applications/thai/root.yaml | 20 +++++++ applications/thai/sso.yaml | 32 +++++++++++ applications/thai/ultra.yaml | 32 +++++++++++ environments/thai/agent-common-values.yaml | 43 +++++++++++++++ environments/thai/agents.yaml | 6 ++ environments/thai/audit-values.yaml | 36 ++++++++++++ environments/thai/edge-common-values.yaml | 35 ++++++++++++ environments/thai/edges.yaml | 7 +++ .../extras/agent-postgres-lb/service.yaml | 18 ++++++ environments/thai/gateway-values.yaml | 33 +++++++++++ environments/thai/image-version.yaml | 35 ++++++++++++ environments/thai/infra-values.yaml | 36 ++++++++++++ environments/thai/mqttx-values.yaml | 19 +++++++ environments/thai/network-agent-values.yaml | 8 +++ environments/thai/release-notes.yaml | 1 + environments/thai/sso-values.yaml | 37 +++++++++++++ environments/thai/ultra-values.yaml | 37 +++++++++++++ 25 files changed, 712 insertions(+) create mode 100644 applications/thai/agent-postgres-lb.yaml create mode 100644 applications/thai/agents.yaml create mode 100644 applications/thai/audit.yaml create mode 100644 applications/thai/edges.yaml create mode 100644 applications/thai/gateway.yaml create mode 100644 applications/thai/infra.yaml create mode 100644 applications/thai/mqttx.yaml create mode 100644 applications/thai/network-agent.yaml create mode 100644 applications/thai/root.yaml create mode 100644 applications/thai/sso.yaml create mode 100644 applications/thai/ultra.yaml create mode 100644 environments/thai/agent-common-values.yaml create mode 100644 environments/thai/agents.yaml create mode 100644 environments/thai/audit-values.yaml create mode 100644 environments/thai/edge-common-values.yaml create mode 100644 environments/thai/edges.yaml create mode 100644 environments/thai/extras/agent-postgres-lb/service.yaml create mode 100644 environments/thai/gateway-values.yaml create mode 100644 environments/thai/image-version.yaml create mode 100644 environments/thai/infra-values.yaml create mode 100644 environments/thai/mqttx-values.yaml create mode 100644 environments/thai/network-agent-values.yaml create mode 100644 environments/thai/release-notes.yaml create mode 100644 environments/thai/sso-values.yaml create mode 100644 environments/thai/ultra-values.yaml diff --git a/applications/thai/agent-postgres-lb.yaml b/applications/thai/agent-postgres-lb.yaml new file mode 100644 index 0000000..0bb26d3 --- /dev/null +++ b/applications/thai/agent-postgres-lb.yaml @@ -0,0 +1,21 @@ +# thai 客户特例:独立小 Application,只管理 environments/thai/extras/agent-postgres-lb/ 下的 +# agent-thai-postgres-lb LoadBalancer Service。不挂进 agents ApplicationSet, +# 避免未来 thai 增加第二个 agent 时被重复渲染。 +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: thai-agent-postgres-lb + namespace: argocd +spec: + project: default + source: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: release + path: environments/thai/extras/agent-postgres-lb + destination: + server: https://kubernetes.default.svc + namespace: mixingx + syncPolicy: + automated: + prune: false + selfHeal: true diff --git a/applications/thai/agents.yaml b/applications/thai/agents.yaml new file mode 100644 index 0000000..fc19322 --- /dev/null +++ b/applications/thai/agents.yaml @@ -0,0 +1,51 @@ +# thai — Agent 单元 ApplicationSet(按 environments/thai/agents.yaml 清单生成) +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-thai-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/thai/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.44 + path: release-charts/mixingx-agent-unit + helm: + releaseName: 'mixingx-agent-{{ .id }}' + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/thai/image-version.yaml + - $values/environments/thai/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/thai/audit.yaml b/applications/thai/audit.yaml new file mode 100644 index 0000000..d4e89e1 --- /dev/null +++ b/applications/thai/audit.yaml @@ -0,0 +1,32 @@ +# thai — mixingx-audit(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / 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/thai/image-version.yaml + - $values/environments/thai/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/thai/edges.yaml b/applications/thai/edges.yaml new file mode 100644 index 0000000..e0ac26a --- /dev/null +++ b/applications/thai/edges.yaml @@ -0,0 +1,55 @@ +# thai — Edge 单元 ApplicationSet(按 environments/thai/edges.yaml 清单生成) +apiVersion: argoproj.io/v1alpha1 +kind: ApplicationSet +metadata: + name: mixingx-thai-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/thai/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.42 + path: release-charts/mixingx-edge-unit + helm: + releaseName: 'mixingx-edge-{{ .id }}' + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/thai/image-version.yaml + - $values/environments/thai/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 diff --git a/applications/thai/gateway.yaml b/applications/thai/gateway.yaml new file mode 100644 index 0000000..d67186e --- /dev/null +++ b/applications/thai/gateway.yaml @@ -0,0 +1,32 @@ +# thai — mixingx-gateway(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / 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/thai/image-version.yaml + - $values/environments/thai/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/thai/infra.yaml b/applications/thai/infra.yaml new file mode 100644 index 0000000..cc957c5 --- /dev/null +++ b/applications/thai/infra.yaml @@ -0,0 +1,32 @@ +# thai — mixingx-infra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / 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.44 + path: release-charts/mixingx-infra + helm: + releaseName: mixingx-infra + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/thai/image-version.yaml + - $values/environments/thai/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/thai/mqttx.yaml b/applications/thai/mqttx.yaml new file mode 100644 index 0000000..04e52ae --- /dev/null +++ b/applications/thai/mqttx.yaml @@ -0,0 +1,29 @@ +# thai — 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.44 + path: release-charts/mixingx-mqttx + helm: + releaseName: mixingx-mqttx + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/thai/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/thai/network-agent.yaml b/applications/thai/network-agent.yaml new file mode 100644 index 0000000..8dffbdd --- /dev/null +++ b/applications/thai/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/thai/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/thai/root.yaml b/applications/thai/root.yaml new file mode 100644 index 0000000..df76e9d --- /dev/null +++ b/applications/thai/root.yaml @@ -0,0 +1,20 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: thai-root + namespace: argocd +spec: + project: default + source: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: release + path: applications/thai + directory: + exclude: "root.yaml" + destination: + server: https://kubernetes.default.svc + namespace: argocd + syncPolicy: + automated: + prune: false + selfHeal: false diff --git a/applications/thai/sso.yaml b/applications/thai/sso.yaml new file mode 100644 index 0000000..a12a4ae --- /dev/null +++ b/applications/thai/sso.yaml @@ -0,0 +1,32 @@ +# thai — mixingx-sso(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / 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.31 + path: release-charts/mixingx-sso + helm: + releaseName: mixingx-sso + valueFiles: + - $values/environments/_common/registry.yaml + - $values/environments/thai/image-version.yaml + - $values/environments/thai/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/thai/ultra.yaml b/applications/thai/ultra.yaml new file mode 100644 index 0000000..af3ef48 --- /dev/null +++ b/applications/thai/ultra.yaml @@ -0,0 +1,32 @@ +# thai — mixingx-ultra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / 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/thai/image-version.yaml + - $values/environments/thai/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/thai/agent-common-values.yaml b/environments/thai/agent-common-values.yaml new file mode 100644 index 0000000..62bb6f0 --- /dev/null +++ b/environments/thai/agent-common-values.yaml @@ -0,0 +1,43 @@ +# thai — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) + +storage: + className: longhorn # TODO: 同 infra-values + size: 50Gi # thai 机根分区仅 98G(sanhua 是 936G 才给 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-thai-mqtt" + username: "" + password: "" + +audit: + publisher: + enabled: true diff --git a/environments/thai/agents.yaml b/environments/thai/agents.yaml new file mode 100644 index 0000000..5222b07 --- /dev/null +++ b/environments/thai/agents.yaml @@ -0,0 +1,6 @@ +# thai — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) + +agents: + - id: thai + description: thai Agent + phaseType: DieCasting diff --git a/environments/thai/audit-values.yaml b/environments/thai/audit-values.yaml new file mode 100644 index 0000000..efdddf4 --- /dev/null +++ b/environments/thai/audit-values.yaml @@ -0,0 +1,36 @@ +# thai — 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 diff --git a/environments/thai/edge-common-values.yaml b/environments/thai/edge-common-values.yaml new file mode 100644 index 0000000..971c2da --- /dev/null +++ b/environments/thai/edge-common-values.yaml @@ -0,0 +1,35 @@ +# thai — 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 diff --git a/environments/thai/edges.yaml b/environments/thai/edges.yaml new file mode 100644 index 0000000..298e535 --- /dev/null +++ b/environments/thai/edges.yaml @@ -0,0 +1,7 @@ +# thai — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-) +# idWorkerId 全平台唯一(1-63);demo 占用 17-18,tuopu-01/mxlexus 占用 21-22,sanhua 31,mxfoxconn850t1 41,thai 从 51 起 + +edges: + - id: thai + idWorkerId: 51 + description: thai 主 Edge diff --git a/environments/thai/extras/agent-postgres-lb/service.yaml b/environments/thai/extras/agent-postgres-lb/service.yaml new file mode 100644 index 0000000..f0df3d4 --- /dev/null +++ b/environments/thai/extras/agent-postgres-lb/service.yaml @@ -0,0 +1,18 @@ +# thai 客户特例:把 agent-thai 的 postgres 以 LoadBalancer 暴露到宿主机所有网卡(各网段 IP:5432 直连)。 +# 不改 hub chart,不动 chart 渲染出的 agent-thai-postgres-service;由 applications/thai/agent-postgres-lb.yaml 接管。 +apiVersion: v1 +kind: Service +metadata: + name: agent-thai-postgres-lb + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: agent-thai-postgres +spec: + type: LoadBalancer + selector: + app.kubernetes.io/component: agent-thai-postgres + ports: + - name: tcp + port: 5432 + targetPort: tcp + protocol: TCP diff --git a/environments/thai/gateway-values.yaml b/environments/thai/gateway-values.yaml new file mode 100644 index 0000000..b24b38e --- /dev/null +++ b/environments/thai/gateway-values.yaml @@ -0,0 +1,33 @@ +# thai — 网关 +# +# ⚠️ 现场核对项: +# - 暴露方式:现场无 *.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 )手工落; +# TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps +ingress: + enabled: false diff --git a/environments/thai/image-version.yaml b/environments/thai/image-version.yaml new file mode 100644 index 0000000..5774345 --- /dev/null +++ b/environments/thai/image-version.yaml @@ -0,0 +1,35 @@ +tag: v1.0.44 +images: + gateway: + repository: gateway + tag: develop-v.1.0.1-202609140639-9 + sso: + repository: sso + tag: develop-v.1.0.1-202609210842-97 + ssoWeb: + repository: sso-web + tag: develop-v.1.0.1-202609210842-97 + 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.42 + edgeWeb: + repository: edge-web + tag: v1.0.42 + agent: + repository: agent + tag: v1.0.44 + agentWeb: + repository: agent-web + tag: v1.0.44 diff --git a/environments/thai/infra-values.yaml b/environments/thai/infra-values.yaml new file mode 100644 index 0000000..18b4701 --- /dev/null +++ b/environments/thai/infra-values.yaml @@ -0,0 +1,36 @@ +# thai — 共享基础设施(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 diff --git a/environments/thai/mqttx-values.yaml b/environments/thai/mqttx-values.yaml new file mode 100644 index 0000000..174225b --- /dev/null +++ b/environments/thai/mqttx-values.yaml @@ -0,0 +1,19 @@ +# thai — MQTTX Web(MQTT 调试客户端) +# +# 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。 +# 暴露:Traefik 专用入口 mqttx(:8082,)——IngressRoute 现场手工落, +# chart ingress 关闭(标准 Ingress 不收 IP host,见 gateway-values 同款注释)。 +# 连接目标 Edge NanoMQ 的方式:把目标 edge 的 NanoMQ Service 临时改 NodePort 并声明 ws 端口 +# (kubectl patch svc edge-thai-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:/mqtt + +mqttx: + name: mqttx + replicas: 1 + description: "MQTT 监控客户端 (thai)" + 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/thai/network-agent-values.yaml b/environments/thai/network-agent-values.yaml new file mode 100644 index 0000000..32aa862 --- /dev/null +++ b/environments/thai/network-agent-values.yaml @@ -0,0 +1,8 @@ +# thai — 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/thai/release-notes.yaml b/environments/thai/release-notes.yaml new file mode 100644 index 0000000..dd3b7f0 --- /dev/null +++ b/environments/thai/release-notes.yaml @@ -0,0 +1 @@ +releases: [] diff --git a/environments/thai/sso-values.yaml b/environments/thai/sso-values.yaml new file mode 100644 index 0000000..b3878c5 --- /dev/null +++ b/environments/thai/sso-values.yaml @@ -0,0 +1,37 @@ +# thai — 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 diff --git a/environments/thai/ultra-values.yaml b/environments/thai/ultra-values.yaml new file mode 100644 index 0000000..72ee706 --- /dev/null +++ b/environments/thai/ultra-values.yaml @@ -0,0 +1,37 @@ +# thai — 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