From ce181d8a7c64759475df539ec90334428c66c75c Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Tue, 29 Sep 2026 10:33:56 +0800 Subject: [PATCH] =?UTF-8?q?release:=20thai=20=E7=8E=AF=E5=A2=83=E6=9B=B4?= =?UTF-8?q?=E5=90=8D=20thai-tuopu-2000-4(=E6=B3=B0=E5=9B=BD=E5=A4=9A?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE,=E5=9B=BD=E5=AE=B6=E5=90=8D=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BD=9C=E7=8E=AF=E5=A2=83=E5=90=8D);chart/image=20?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=20sanhua=20v1.0.45?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../thai-tuopu-2000-4/agent-postgres-lb.yaml | 21 +++++++++++++++++++ .../{thai => thai-tuopu-2000-4}/agents.yaml | 12 +++++------ .../{thai => thai-tuopu-2000-4}/audit.yaml | 8 +++---- .../{thai => thai-tuopu-2000-4}/edges.yaml | 10 ++++----- .../{thai => thai-tuopu-2000-4}/gateway.yaml | 8 +++---- .../{thai => thai-tuopu-2000-4}/infra.yaml | 10 ++++----- .../{thai => thai-tuopu-2000-4}/mqttx.yaml | 6 +++--- .../network-agent.yaml | 2 +- .../{thai => thai-tuopu-2000-4}/root.yaml | 4 ++-- .../{thai => thai-tuopu-2000-4}/sso.yaml | 8 +++---- .../{thai => thai-tuopu-2000-4}/ultra.yaml | 8 +++---- applications/thai/agent-postgres-lb.yaml | 21 ------------------- .../agent-common-values.yaml | 6 +++--- environments/thai-tuopu-2000-4/agents.yaml | 6 ++++++ .../audit-values.yaml | 2 +- .../edge-common-values.yaml | 2 +- environments/thai-tuopu-2000-4/edges.yaml | 7 +++++++ .../extras/agent-postgres-lb/service.yaml | 18 ++++++++++++++++ .../gateway-values.yaml | 4 ++-- .../image-version.yaml | 4 ++-- .../infra-values.yaml | 2 +- .../mqttx-values.yaml | 8 +++---- .../network-agent-values.yaml | 2 +- .../release-notes.yaml | 0 .../sso-values.yaml | 2 +- .../ultra-values.yaml | 2 +- environments/thai/agents.yaml | 6 ------ environments/thai/edges.yaml | 7 ------- .../extras/agent-postgres-lb/service.yaml | 18 ---------------- 29 files changed, 107 insertions(+), 107 deletions(-) create mode 100644 applications/thai-tuopu-2000-4/agent-postgres-lb.yaml rename applications/{thai => thai-tuopu-2000-4}/agents.yaml (75%) rename applications/{thai => thai-tuopu-2000-4}/audit.yaml (76%) rename applications/{thai => thai-tuopu-2000-4}/edges.yaml (80%) rename applications/{thai => thai-tuopu-2000-4}/gateway.yaml (76%) rename applications/{thai => thai-tuopu-2000-4}/infra.yaml (73%) rename applications/{thai => thai-tuopu-2000-4}/mqttx.yaml (81%) rename applications/{thai => thai-tuopu-2000-4}/network-agent.yaml (89%) rename applications/{thai => thai-tuopu-2000-4}/root.yaml (84%) rename applications/{thai => thai-tuopu-2000-4}/sso.yaml (77%) rename applications/{thai => thai-tuopu-2000-4}/ultra.yaml (76%) delete mode 100644 applications/thai/agent-postgres-lb.yaml rename environments/{thai => thai-tuopu-2000-4}/agent-common-values.yaml (78%) create mode 100644 environments/thai-tuopu-2000-4/agents.yaml rename environments/{thai => thai-tuopu-2000-4}/audit-values.yaml (90%) rename environments/{thai => thai-tuopu-2000-4}/edge-common-values.yaml (89%) create mode 100644 environments/thai-tuopu-2000-4/edges.yaml create mode 100644 environments/thai-tuopu-2000-4/extras/agent-postgres-lb/service.yaml rename environments/{thai => thai-tuopu-2000-4}/gateway-values.yaml (87%) rename environments/{thai => thai-tuopu-2000-4}/image-version.yaml (87%) rename environments/{thai => thai-tuopu-2000-4}/infra-values.yaml (94%) rename environments/{thai => thai-tuopu-2000-4}/mqttx-values.yaml (64%) rename environments/{thai => thai-tuopu-2000-4}/network-agent-values.yaml (69%) rename environments/{thai => thai-tuopu-2000-4}/release-notes.yaml (100%) rename environments/{thai => thai-tuopu-2000-4}/sso-values.yaml (92%) rename environments/{thai => thai-tuopu-2000-4}/ultra-values.yaml (90%) delete mode 100644 environments/thai/agents.yaml delete mode 100644 environments/thai/edges.yaml delete mode 100644 environments/thai/extras/agent-postgres-lb/service.yaml diff --git a/applications/thai-tuopu-2000-4/agent-postgres-lb.yaml b/applications/thai-tuopu-2000-4/agent-postgres-lb.yaml new file mode 100644 index 0000000..4385155 --- /dev/null +++ b/applications/thai-tuopu-2000-4/agent-postgres-lb.yaml @@ -0,0 +1,21 @@ +# thai-tuopu-2000-4 客户特例:独立小 Application,只管理 environments/thai-tuopu-2000-4/extras/agent-postgres-lb/ 下的 +# agent-thai-tuopu-2000-4-postgres-lb LoadBalancer Service。不挂进 agents ApplicationSet, +# 避免未来 thai-tuopu-2000-4 增加第二个 agent 时被重复渲染。 +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: thai-tuopu-2000-4-agent-postgres-lb + namespace: argocd +spec: + project: default + source: + repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git + targetRevision: release + path: environments/thai-tuopu-2000-4/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-tuopu-2000-4/agents.yaml similarity index 75% rename from applications/thai/agents.yaml rename to applications/thai-tuopu-2000-4/agents.yaml index fc19322..420bd73 100644 --- a/applications/thai/agents.yaml +++ b/applications/thai-tuopu-2000-4/agents.yaml @@ -1,8 +1,8 @@ -# thai — Agent 单元 ApplicationSet(按 environments/thai/agents.yaml 清单生成) +# thai-tuopu-2000-4 — Agent 单元 ApplicationSet(按 environments/thai-tuopu-2000-4/agents.yaml 清单生成) apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: mixingx-thai-agents + name: mixingx-thai-tuopu-2000-4-agents namespace: argocd spec: goTemplate: true @@ -15,7 +15,7 @@ spec: repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git revision: release files: - - path: environments/thai/agents.yaml + - path: environments/thai-tuopu-2000-4/agents.yaml - list: elementsYaml: '{{ .agents | toJson }}' template: @@ -25,14 +25,14 @@ spec: project: default sources: - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git - targetRevision: chart-v1.0.44 + targetRevision: chart-v1.0.45 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/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/agent-common-values.yaml values: | site: "{{ .id }}" description: "{{ .description }}" diff --git a/applications/thai/audit.yaml b/applications/thai-tuopu-2000-4/audit.yaml similarity index 76% rename from applications/thai/audit.yaml rename to applications/thai-tuopu-2000-4/audit.yaml index d4e89e1..27c4a90 100644 --- a/applications/thai/audit.yaml +++ b/applications/thai-tuopu-2000-4/audit.yaml @@ -1,5 +1,5 @@ -# thai — mixingx-audit(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 / +# thai-tuopu-2000-4 — mixingx-audit(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -16,8 +16,8 @@ spec: releaseName: mixingx-audit valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/image-version.yaml - - $values/environments/thai/audit-values.yaml + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/audit-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/edges.yaml b/applications/thai-tuopu-2000-4/edges.yaml similarity index 80% rename from applications/thai/edges.yaml rename to applications/thai-tuopu-2000-4/edges.yaml index e0ac26a..7fc83a7 100644 --- a/applications/thai/edges.yaml +++ b/applications/thai-tuopu-2000-4/edges.yaml @@ -1,8 +1,8 @@ -# thai — Edge 单元 ApplicationSet(按 environments/thai/edges.yaml 清单生成) +# thai-tuopu-2000-4 — Edge 单元 ApplicationSet(按 environments/thai-tuopu-2000-4/edges.yaml 清单生成) apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: mixingx-thai-edges + name: mixingx-thai-tuopu-2000-4-edges namespace: argocd spec: goTemplate: true @@ -15,7 +15,7 @@ spec: repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git revision: release files: - - path: environments/thai/edges.yaml + - path: environments/thai-tuopu-2000-4/edges.yaml - list: elementsYaml: '{{ .edges | toJson }}' template: @@ -31,8 +31,8 @@ spec: releaseName: 'mixingx-edge-{{ .id }}' valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/image-version.yaml - - $values/environments/thai/edge-common-values.yaml + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/edge-common-values.yaml values: | site: "{{ .id }}" idWorkerId: {{ .idWorkerId }} diff --git a/applications/thai/gateway.yaml b/applications/thai-tuopu-2000-4/gateway.yaml similarity index 76% rename from applications/thai/gateway.yaml rename to applications/thai-tuopu-2000-4/gateway.yaml index d67186e..d646f9f 100644 --- a/applications/thai/gateway.yaml +++ b/applications/thai-tuopu-2000-4/gateway.yaml @@ -1,5 +1,5 @@ -# thai — mixingx-gateway(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 / +# thai-tuopu-2000-4 — mixingx-gateway(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -16,8 +16,8 @@ spec: releaseName: mixingx-gateway valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/image-version.yaml - - $values/environments/thai/gateway-values.yaml + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/gateway-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/infra.yaml b/applications/thai-tuopu-2000-4/infra.yaml similarity index 73% rename from applications/thai/infra.yaml rename to applications/thai-tuopu-2000-4/infra.yaml index cc957c5..01f2cd9 100644 --- a/applications/thai/infra.yaml +++ b/applications/thai-tuopu-2000-4/infra.yaml @@ -1,5 +1,5 @@ -# thai — mixingx-infra(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 / +# thai-tuopu-2000-4 — mixingx-infra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -10,14 +10,14 @@ spec: project: default sources: - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git - targetRevision: chart-v1.0.44 + targetRevision: chart-v1.0.45 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 + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/infra-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/mqttx.yaml b/applications/thai-tuopu-2000-4/mqttx.yaml similarity index 81% rename from applications/thai/mqttx.yaml rename to applications/thai-tuopu-2000-4/mqttx.yaml index 04e52ae..ccdbc73 100644 --- a/applications/thai/mqttx.yaml +++ b/applications/thai-tuopu-2000-4/mqttx.yaml @@ -1,4 +1,4 @@ -# thai — MQTTX 调试客户端 +# thai-tuopu-2000-4 — MQTTX 调试客户端 apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -8,13 +8,13 @@ spec: project: default sources: - repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git - targetRevision: chart-v1.0.44 + targetRevision: chart-v1.0.45 path: release-charts/mixingx-mqttx helm: releaseName: mixingx-mqttx valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/mqttx-values.yaml + - $values/environments/thai-tuopu-2000-4/mqttx-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/network-agent.yaml b/applications/thai-tuopu-2000-4/network-agent.yaml similarity index 89% rename from applications/thai/network-agent.yaml rename to applications/thai-tuopu-2000-4/network-agent.yaml index 8dffbdd..bd004ff 100644 --- a/applications/thai/network-agent.yaml +++ b/applications/thai-tuopu-2000-4/network-agent.yaml @@ -13,7 +13,7 @@ spec: releaseName: mixingx-network-agent valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/network-agent-values.yaml + - $values/environments/thai-tuopu-2000-4/network-agent-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/root.yaml b/applications/thai-tuopu-2000-4/root.yaml similarity index 84% rename from applications/thai/root.yaml rename to applications/thai-tuopu-2000-4/root.yaml index df76e9d..512b513 100644 --- a/applications/thai/root.yaml +++ b/applications/thai-tuopu-2000-4/root.yaml @@ -1,14 +1,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: thai-root + name: thai-tuopu-2000-4-root namespace: argocd spec: project: default source: repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release - path: applications/thai + path: applications/thai-tuopu-2000-4 directory: exclude: "root.yaml" destination: diff --git a/applications/thai/sso.yaml b/applications/thai-tuopu-2000-4/sso.yaml similarity index 77% rename from applications/thai/sso.yaml rename to applications/thai-tuopu-2000-4/sso.yaml index a12a4ae..f54c3bf 100644 --- a/applications/thai/sso.yaml +++ b/applications/thai-tuopu-2000-4/sso.yaml @@ -1,5 +1,5 @@ -# thai — mixingx-sso(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 / +# thai-tuopu-2000-4 — mixingx-sso(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -16,8 +16,8 @@ spec: releaseName: mixingx-sso valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/image-version.yaml - - $values/environments/thai/sso-values.yaml + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/sso-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/ultra.yaml b/applications/thai-tuopu-2000-4/ultra.yaml similarity index 76% rename from applications/thai/ultra.yaml rename to applications/thai-tuopu-2000-4/ultra.yaml index af3ef48..f4c40d1 100644 --- a/applications/thai/ultra.yaml +++ b/applications/thai-tuopu-2000-4/ultra.yaml @@ -1,5 +1,5 @@ -# thai — mixingx-ultra(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 / +# thai-tuopu-2000-4 — mixingx-ultra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -16,8 +16,8 @@ spec: releaseName: mixingx-ultra valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/thai/image-version.yaml - - $values/environments/thai/ultra-values.yaml + - $values/environments/thai-tuopu-2000-4/image-version.yaml + - $values/environments/thai-tuopu-2000-4/ultra-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/thai/agent-postgres-lb.yaml b/applications/thai/agent-postgres-lb.yaml deleted file mode 100644 index 0bb26d3..0000000 --- a/applications/thai/agent-postgres-lb.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# 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/environments/thai/agent-common-values.yaml b/environments/thai-tuopu-2000-4/agent-common-values.yaml similarity index 78% rename from environments/thai/agent-common-values.yaml rename to environments/thai-tuopu-2000-4/agent-common-values.yaml index 62bb6f0..fcd3a32 100644 --- a/environments/thai/agent-common-values.yaml +++ b/environments/thai-tuopu-2000-4/agent-common-values.yaml @@ -1,8 +1,8 @@ -# thai — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) +# thai-tuopu-2000-4 — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) storage: className: longhorn # TODO: 同 infra-values - size: 50Gi # thai 机根分区仅 98G(sanhua 是 936G 才给 200Gi) + size: 50Gi # thai-tuopu-2000-4 机根分区仅 98G(sanhua 是 936G 才给 200Gi) keep: true images: @@ -34,7 +34,7 @@ sharedInfra: # MQTT 凭据:对齐 demo 模式(credentialRef = edge--mqtt;NanoMQ 匿名,账号留空) mqttCredentials: - - credentialRef: "edge-thai-mqtt" + - credentialRef: "edge-thai-tuopu-2000-4-mqtt" username: "" password: "" diff --git a/environments/thai-tuopu-2000-4/agents.yaml b/environments/thai-tuopu-2000-4/agents.yaml new file mode 100644 index 0000000..6acdbc2 --- /dev/null +++ b/environments/thai-tuopu-2000-4/agents.yaml @@ -0,0 +1,6 @@ +# thai-tuopu-2000-4 — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) + +agents: + - id: thai-tuopu-2000-4 + description: thai-tuopu-2000-4 Agent + phaseType: DieCasting diff --git a/environments/thai/audit-values.yaml b/environments/thai-tuopu-2000-4/audit-values.yaml similarity index 90% rename from environments/thai/audit-values.yaml rename to environments/thai-tuopu-2000-4/audit-values.yaml index efdddf4..9a03970 100644 --- a/environments/thai/audit-values.yaml +++ b/environments/thai-tuopu-2000-4/audit-values.yaml @@ -1,4 +1,4 @@ -# thai — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065) +# thai-tuopu-2000-4 — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/thai/edge-common-values.yaml b/environments/thai-tuopu-2000-4/edge-common-values.yaml similarity index 89% rename from environments/thai/edge-common-values.yaml rename to environments/thai-tuopu-2000-4/edge-common-values.yaml index 971c2da..7382299 100644 --- a/environments/thai/edge-common-values.yaml +++ b/environments/thai-tuopu-2000-4/edge-common-values.yaml @@ -1,4 +1,4 @@ -# thai — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加) +# thai-tuopu-2000-4 — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加) storage: className: longhorn # TODO: edge 配置存储的 SC;若现场用 local-path 则替换 diff --git a/environments/thai-tuopu-2000-4/edges.yaml b/environments/thai-tuopu-2000-4/edges.yaml new file mode 100644 index 0000000..6aba8b3 --- /dev/null +++ b/environments/thai-tuopu-2000-4/edges.yaml @@ -0,0 +1,7 @@ +# thai-tuopu-2000-4 — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-) +# idWorkerId 全平台唯一(1-63);demo 占用 17-18,tuopu-01/mxlexus 占用 21-22,sanhua 31,mxfoxconn850t1 41,thai-tuopu-2000-4 从 51 起 + +edges: + - id: thai-tuopu-2000-4 + idWorkerId: 51 + description: thai-tuopu-2000-4 主 Edge diff --git a/environments/thai-tuopu-2000-4/extras/agent-postgres-lb/service.yaml b/environments/thai-tuopu-2000-4/extras/agent-postgres-lb/service.yaml new file mode 100644 index 0000000..f96036b --- /dev/null +++ b/environments/thai-tuopu-2000-4/extras/agent-postgres-lb/service.yaml @@ -0,0 +1,18 @@ +# thai-tuopu-2000-4 客户特例:把 agent-thai-tuopu-2000-4 的 postgres 以 LoadBalancer 暴露到宿主机所有网卡(各网段 IP:5432 直连)。 +# 不改 hub chart,不动 chart 渲染出的 agent-thai-tuopu-2000-4-postgres-service;由 applications/thai-tuopu-2000-4/agent-postgres-lb.yaml 接管。 +apiVersion: v1 +kind: Service +metadata: + name: agent-thai-tuopu-2000-4-postgres-lb + labels: + app.kubernetes.io/name: mixingx + app.kubernetes.io/component: agent-thai-tuopu-2000-4-postgres +spec: + type: LoadBalancer + selector: + app.kubernetes.io/component: agent-thai-tuopu-2000-4-postgres + ports: + - name: tcp + port: 5432 + targetPort: tcp + protocol: TCP diff --git a/environments/thai/gateway-values.yaml b/environments/thai-tuopu-2000-4/gateway-values.yaml similarity index 87% rename from environments/thai/gateway-values.yaml rename to environments/thai-tuopu-2000-4/gateway-values.yaml index b24b38e..9d3600c 100644 --- a/environments/thai/gateway-values.yaml +++ b/environments/thai-tuopu-2000-4/gateway-values.yaml @@ -1,4 +1,4 @@ -# thai — 网关 +# thai-tuopu-2000-4 — 网关 # # ⚠️ 现场核对项: # - 暴露方式:现场无 *.mixingx.local DNS,ingress 默认关闭; @@ -27,7 +27,7 @@ gateway: rbac: true # 暴露方式:chart 的标准 Ingress 不支持 IP 作 host(K8s 校验拒绝), -# 现场以 Traefik IngressRoute(Host )手工落; +# 现场以 Traefik IngressRoute(Host )手工落; # TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps ingress: enabled: false diff --git a/environments/thai/image-version.yaml b/environments/thai-tuopu-2000-4/image-version.yaml similarity index 87% rename from environments/thai/image-version.yaml rename to environments/thai-tuopu-2000-4/image-version.yaml index 5774345..d8c3c1b 100644 --- a/environments/thai/image-version.yaml +++ b/environments/thai-tuopu-2000-4/image-version.yaml @@ -29,7 +29,7 @@ images: tag: v1.0.42 agent: repository: agent - tag: v1.0.44 + tag: develop-v.1.0.1-202609290125-137 agentWeb: repository: agent-web - tag: v1.0.44 + tag: develop-v.1.0.1-202609290125-137 diff --git a/environments/thai/infra-values.yaml b/environments/thai-tuopu-2000-4/infra-values.yaml similarity index 94% rename from environments/thai/infra-values.yaml rename to environments/thai-tuopu-2000-4/infra-values.yaml index 18b4701..8495a51 100644 --- a/environments/thai/infra-values.yaml +++ b/environments/thai-tuopu-2000-4/infra-values.yaml @@ -1,4 +1,4 @@ -# thai — 共享基础设施(redis / rabbitmq) +# thai-tuopu-2000-4 — 共享基础设施(redis / rabbitmq) # # ⚠️ 现场核对项: # - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认 diff --git a/environments/thai/mqttx-values.yaml b/environments/thai-tuopu-2000-4/mqttx-values.yaml similarity index 64% rename from environments/thai/mqttx-values.yaml rename to environments/thai-tuopu-2000-4/mqttx-values.yaml index 174225b..b2ec2ef 100644 --- a/environments/thai/mqttx-values.yaml +++ b/environments/thai-tuopu-2000-4/mqttx-values.yaml @@ -1,15 +1,15 @@ -# thai — MQTTX Web(MQTT 调试客户端) +# thai-tuopu-2000-4 — MQTTX Web(MQTT 调试客户端) # # 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。 -# 暴露:Traefik 专用入口 mqttx(:8082,)——IngressRoute 现场手工落, +# 暴露: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 +# (kubectl patch svc edge-thai-tuopu-2000-4-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:/mqtt mqttx: name: mqttx replicas: 1 - description: "MQTT 监控客户端 (thai)" + description: "MQTT 监控客户端 (thai-tuopu-2000-4)" image: # 显式 ACR 引用(ADR-0066);latest + IfNotPresent:首次拉取后固定,不再漂移 repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/mqttx-web diff --git a/environments/thai/network-agent-values.yaml b/environments/thai-tuopu-2000-4/network-agent-values.yaml similarity index 69% rename from environments/thai/network-agent-values.yaml rename to environments/thai-tuopu-2000-4/network-agent-values.yaml index 32aa862..1ab1b90 100644 --- a/environments/thai/network-agent-values.yaml +++ b/environments/thai-tuopu-2000-4/network-agent-values.yaml @@ -1,4 +1,4 @@ -# thai — network-agent(网卡/Wi-Fi 工具,独立 chart mixingx-network-agent) +# thai-tuopu-2000-4 — network-agent(网卡/Wi-Fi 工具,独立 chart mixingx-network-agent) # 镜像地址的 registry 由 image-version.yaml 顶层提供(ACR);此处只钉 tag。 image: tag: develop-v.1.0.1-202609100650-37 diff --git a/environments/thai/release-notes.yaml b/environments/thai-tuopu-2000-4/release-notes.yaml similarity index 100% rename from environments/thai/release-notes.yaml rename to environments/thai-tuopu-2000-4/release-notes.yaml diff --git a/environments/thai/sso-values.yaml b/environments/thai-tuopu-2000-4/sso-values.yaml similarity index 92% rename from environments/thai/sso-values.yaml rename to environments/thai-tuopu-2000-4/sso-values.yaml index b3878c5..a4cb5b9 100644 --- a/environments/thai/sso-values.yaml +++ b/environments/thai-tuopu-2000-4/sso-values.yaml @@ -1,4 +1,4 @@ -# thai — SSO(后端 + web + 专属 PostgreSQL) +# thai-tuopu-2000-4 — SSO(后端 + web + 专属 PostgreSQL) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/thai/ultra-values.yaml b/environments/thai-tuopu-2000-4/ultra-values.yaml similarity index 90% rename from environments/thai/ultra-values.yaml rename to environments/thai-tuopu-2000-4/ultra-values.yaml index 72ee706..65805e8 100644 --- a/environments/thai/ultra-values.yaml +++ b/environments/thai-tuopu-2000-4/ultra-values.yaml @@ -1,4 +1,4 @@ -# thai — Ultra 看板(后端 + web + 专属 PostgreSQL) +# thai-tuopu-2000-4 — Ultra 看板(后端 + web + 专属 PostgreSQL) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/thai/agents.yaml b/environments/thai/agents.yaml deleted file mode 100644 index 5222b07..0000000 --- a/environments/thai/agents.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# thai — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) - -agents: - - id: thai - description: thai Agent - phaseType: DieCasting diff --git a/environments/thai/edges.yaml b/environments/thai/edges.yaml deleted file mode 100644 index 298e535..0000000 --- a/environments/thai/edges.yaml +++ /dev/null @@ -1,7 +0,0 @@ -# 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 deleted file mode 100644 index f0df3d4..0000000 --- a/environments/thai/extras/agent-postgres-lb/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# 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