diff --git a/applications/mxinit/agents.yaml b/applications/daye/agents.yaml similarity index 81% rename from applications/mxinit/agents.yaml rename to applications/daye/agents.yaml index b429176..f7d612d 100644 --- a/applications/mxinit/agents.yaml +++ b/applications/daye/agents.yaml @@ -1,8 +1,8 @@ -# mxinit — Agent 单元 ApplicationSet(按 environments/mxinit/agents.yaml 清单生成) +# daye — Agent 单元 ApplicationSet(按 environments/daye/agents.yaml 清单生成) apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: mixingx-mxinit-agents + name: mixingx-daye-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/mxinit/agents.yaml + - path: environments/daye/agents.yaml - list: elementsYaml: '{{ .agents | toJson }}' template: @@ -31,8 +31,8 @@ spec: releaseName: 'mixingx-agent-{{ .id }}' valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/mxinit/image-version.yaml - - $values/environments/mxinit/agent-common-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/agent-common-values.yaml values: | site: "{{ .id }}" description: "{{ .description }}" diff --git a/applications/mxinit/audit.yaml b/applications/daye/audit.yaml similarity index 80% rename from applications/mxinit/audit.yaml rename to applications/daye/audit.yaml index 0a71c20..b266c5c 100644 --- a/applications/mxinit/audit.yaml +++ b/applications/daye/audit.yaml @@ -1,5 +1,5 @@ -# mxinit — mixingx-audit(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 / +# daye — mixingx-audit(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+daye / 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/mxinit/image-version.yaml - - $values/environments/mxinit/audit-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/audit-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/edges.yaml b/applications/daye/edges.yaml similarity index 87% rename from applications/mxinit/edges.yaml rename to applications/daye/edges.yaml index 595e4c6..b3ddf50 100644 --- a/applications/mxinit/edges.yaml +++ b/applications/daye/edges.yaml @@ -1,8 +1,8 @@ -# mxinit — Edge 单元 ApplicationSet(按 environments/mxinit/edges.yaml 清单生成) +# daye — Edge 单元 ApplicationSet(按 environments/daye/edges.yaml 清单生成) apiVersion: argoproj.io/v1alpha1 kind: ApplicationSet metadata: - name: mixingx-mxinit-edges + name: mixingx-daye-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/mxinit/edges.yaml + - path: environments/daye/edges.yaml - list: elementsYaml: '{{ .edges | toJson }}' template: @@ -31,8 +31,8 @@ spec: releaseName: 'mixingx-edge-{{ .id }}' valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/mxinit/image-version.yaml - - $values/environments/mxinit/edge-common-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/edge-common-values.yaml values: | site: "{{ .id }}" idWorkerId: {{ .idWorkerId }} diff --git a/applications/mxinit/gateway.yaml b/applications/daye/gateway.yaml similarity index 79% rename from applications/mxinit/gateway.yaml rename to applications/daye/gateway.yaml index 038cfd7..b96d2f4 100644 --- a/applications/mxinit/gateway.yaml +++ b/applications/daye/gateway.yaml @@ -1,5 +1,5 @@ -# mxinit — mixingx-gateway(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 / +# daye — mixingx-gateway(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+daye / 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/mxinit/image-version.yaml - - $values/environments/mxinit/gateway-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/gateway-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/infra.yaml b/applications/daye/infra.yaml similarity index 80% rename from applications/mxinit/infra.yaml rename to applications/daye/infra.yaml index f617bfc..99b0faf 100644 --- a/applications/mxinit/infra.yaml +++ b/applications/daye/infra.yaml @@ -1,5 +1,5 @@ -# mxinit — mixingx-infra(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 / +# daye — mixingx-infra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+daye / deploy 钉 release 分支 / # automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源) apiVersion: argoproj.io/v1alpha1 kind: Application @@ -16,8 +16,8 @@ spec: releaseName: mixingx-infra valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/mxinit/image-version.yaml - - $values/environments/mxinit/infra-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/infra-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/mqttx.yaml b/applications/daye/mqttx.yaml similarity index 88% rename from applications/mxinit/mqttx.yaml rename to applications/daye/mqttx.yaml index 2244a6c..dde6b29 100644 --- a/applications/mxinit/mqttx.yaml +++ b/applications/daye/mqttx.yaml @@ -1,4 +1,4 @@ -# mxinit — MQTTX 调试客户端 +# daye — MQTTX 调试客户端 apiVersion: argoproj.io/v1alpha1 kind: Application metadata: @@ -14,7 +14,7 @@ spec: releaseName: mixingx-mqttx valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/mxinit/mqttx-values.yaml + - $values/environments/daye/mqttx-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/network-agent.yaml b/applications/daye/network-agent.yaml similarity index 91% rename from applications/mxinit/network-agent.yaml rename to applications/daye/network-agent.yaml index bdbb6fd..ba907ca 100644 --- a/applications/mxinit/network-agent.yaml +++ b/applications/daye/network-agent.yaml @@ -13,7 +13,7 @@ spec: releaseName: mixingx-network-agent valueFiles: - $values/environments/_common/registry.yaml - - $values/environments/mxinit/network-agent-values.yaml + - $values/environments/daye/network-agent-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/root.yaml b/applications/daye/root.yaml similarity index 88% rename from applications/mxinit/root.yaml rename to applications/daye/root.yaml index 090c765..8ad1585 100644 --- a/applications/mxinit/root.yaml +++ b/applications/daye/root.yaml @@ -1,14 +1,14 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: mxinit-root + name: daye-root namespace: argocd spec: project: default source: repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release - path: applications/mxinit + path: applications/daye directory: exclude: "root.yaml" destination: diff --git a/applications/mxinit/sso.yaml b/applications/daye/sso.yaml similarity index 80% rename from applications/mxinit/sso.yaml rename to applications/daye/sso.yaml index 8490065..55348a4 100644 --- a/applications/mxinit/sso.yaml +++ b/applications/daye/sso.yaml @@ -1,5 +1,5 @@ -# mxinit — mixingx-sso(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 / +# daye — mixingx-sso(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+daye / 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/mxinit/image-version.yaml - - $values/environments/mxinit/sso-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/sso-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/applications/mxinit/ultra.yaml b/applications/daye/ultra.yaml similarity index 80% rename from applications/mxinit/ultra.yaml rename to applications/daye/ultra.yaml index 83ae409..22b5a87 100644 --- a/applications/mxinit/ultra.yaml +++ b/applications/daye/ultra.yaml @@ -1,5 +1,5 @@ -# mxinit — mixingx-ultra(客户环境 Application,ADR-0068) -# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+mxinit / deploy 钉 release 分支 / +# daye — mixingx-ultra(客户环境 Application,ADR-0068) +# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+daye / 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/mxinit/image-version.yaml - - $values/environments/mxinit/ultra-values.yaml + - $values/environments/daye/image-version.yaml + - $values/environments/daye/ultra-values.yaml - repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git targetRevision: release ref: values diff --git a/environments/mxinit/agent-common-values.yaml b/environments/daye/agent-common-values.yaml similarity index 88% rename from environments/mxinit/agent-common-values.yaml rename to environments/daye/agent-common-values.yaml index f29ad12..b564dbd 100644 --- a/environments/mxinit/agent-common-values.yaml +++ b/environments/daye/agent-common-values.yaml @@ -1,4 +1,4 @@ -# mxinit — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) +# daye — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加) storage: className: longhorn @@ -34,7 +34,7 @@ sharedInfra: # MQTT 凭据:对齐 demo 模式(credentialRef = edge--mqtt;NanoMQ 匿名,账号留空) mqttCredentials: - - credentialRef: "edge-mxinit-mqtt" + - credentialRef: "edge-daye-mqtt" username: "" password: "" diff --git a/environments/daye/agents.yaml b/environments/daye/agents.yaml new file mode 100644 index 0000000..7909fa6 --- /dev/null +++ b/environments/daye/agents.yaml @@ -0,0 +1,6 @@ +# daye — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) + +agents: + - id: daye + description: daye Agent + phaseType: DieCasting diff --git a/environments/mxinit/audit-values.yaml b/environments/daye/audit-values.yaml similarity index 91% rename from environments/mxinit/audit-values.yaml rename to environments/daye/audit-values.yaml index aece37f..ce360a9 100644 --- a/environments/mxinit/audit-values.yaml +++ b/environments/daye/audit-values.yaml @@ -1,4 +1,4 @@ -# mxinit — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065) +# daye — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/mxinit/edge-common-values.yaml b/environments/daye/edge-common-values.yaml similarity index 90% rename from environments/mxinit/edge-common-values.yaml rename to environments/daye/edge-common-values.yaml index 16851ca..28be4da 100644 --- a/environments/mxinit/edge-common-values.yaml +++ b/environments/daye/edge-common-values.yaml @@ -1,4 +1,4 @@ -# mxinit — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加) +# daye — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加) storage: className: longhorn # TODO: edge 配置存储的 SC;若现场用 local-path 则替换 diff --git a/environments/daye/edges.yaml b/environments/daye/edges.yaml new file mode 100644 index 0000000..9c97025 --- /dev/null +++ b/environments/daye/edges.yaml @@ -0,0 +1,14 @@ +# daye — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-) +# idWorkerId 全平台唯一(1-63);demo 占用 17-18,tuopu-01 占用 21-22,sanhua 占 31, +# mxinit 占 41(环境已删,号码预留),daye 占 51 + +edges: + - id: daye + idWorkerId: 51 + description: daye 主 Edge + # ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。 + # localNetId 第 4 字节与 idWorkerId 对齐便于记忆。 + adsRouter: + localNetId: "10.200.0.51.1.1" + # daye 现场机器出口源地址;装机后按实际 IP 更新并 push。 + publicAddress: "192.168.1.247" diff --git a/environments/mxinit/gateway-values.yaml b/environments/daye/gateway-values.yaml similarity index 89% rename from environments/mxinit/gateway-values.yaml rename to environments/daye/gateway-values.yaml index 8240c9e..2476820 100644 --- a/environments/mxinit/gateway-values.yaml +++ b/environments/daye/gateway-values.yaml @@ -1,4 +1,4 @@ -# mxinit — 网关 +# daye — 网关 # # ⚠️ 现场核对项: # - 暴露方式:现场无 *.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/mxinit/image-version.yaml b/environments/daye/image-version.yaml similarity index 100% rename from environments/mxinit/image-version.yaml rename to environments/daye/image-version.yaml diff --git a/environments/mxinit/infra-values.yaml b/environments/daye/infra-values.yaml similarity index 95% rename from environments/mxinit/infra-values.yaml rename to environments/daye/infra-values.yaml index 13c2f4f..4a244d7 100644 --- a/environments/mxinit/infra-values.yaml +++ b/environments/daye/infra-values.yaml @@ -1,4 +1,4 @@ -# mxinit — 共享基础设施(redis / rabbitmq) +# daye — 共享基础设施(redis / rabbitmq) # # ⚠️ 现场核对项: # - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认 diff --git a/environments/mxinit/mqttx-values.yaml b/environments/daye/mqttx-values.yaml similarity index 67% rename from environments/mxinit/mqttx-values.yaml rename to environments/daye/mqttx-values.yaml index 48f267f..f0064aa 100644 --- a/environments/mxinit/mqttx-values.yaml +++ b/environments/daye/mqttx-values.yaml @@ -1,15 +1,15 @@ -# mxinit — MQTTX Web(MQTT 调试客户端) +# daye — 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-mxinit-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:/mqtt +# (kubectl patch svc edge-daye-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:/mqtt mqttx: name: mqttx replicas: 1 - description: "MQTT 监控客户端 (mxinit)" + description: "MQTT 监控客户端 (daye)" image: # 显式 ACR 引用(ADR-0066);latest + IfNotPresent:首次拉取后固定,不再漂移 repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/mqttx-web diff --git a/environments/mxinit/network-agent-values.yaml b/environments/daye/network-agent-values.yaml similarity index 70% rename from environments/mxinit/network-agent-values.yaml rename to environments/daye/network-agent-values.yaml index 2e2ad7e..4b6db22 100644 --- a/environments/mxinit/network-agent-values.yaml +++ b/environments/daye/network-agent-values.yaml @@ -1,4 +1,4 @@ -# mxinit — network-agent(网卡/Wi-Fi 工具,独立 chart mixingx-network-agent) +# daye — network-agent(网卡/Wi-Fi 工具,独立 chart mixingx-network-agent) # 镜像地址的 registry 由 image-version.yaml 顶层提供(ACR);此处只钉 tag。 image: tag: v1.0.68 diff --git a/environments/mxinit/release-notes.yaml b/environments/daye/release-notes.yaml similarity index 100% rename from environments/mxinit/release-notes.yaml rename to environments/daye/release-notes.yaml diff --git a/environments/mxinit/sso-values.yaml b/environments/daye/sso-values.yaml similarity index 93% rename from environments/mxinit/sso-values.yaml rename to environments/daye/sso-values.yaml index 0a38664..0263edb 100644 --- a/environments/mxinit/sso-values.yaml +++ b/environments/daye/sso-values.yaml @@ -1,4 +1,4 @@ -# mxinit — SSO(后端 + web + 专属 PostgreSQL) +# daye — SSO(后端 + web + 专属 PostgreSQL) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/mxinit/ultra-values.yaml b/environments/daye/ultra-values.yaml similarity index 92% rename from environments/mxinit/ultra-values.yaml rename to environments/daye/ultra-values.yaml index 1946360..5946bbc 100644 --- a/environments/mxinit/ultra-values.yaml +++ b/environments/daye/ultra-values.yaml @@ -1,4 +1,4 @@ -# mxinit — Ultra 看板(后端 + web + 专属 PostgreSQL) +# daye — Ultra 看板(后端 + web + 专属 PostgreSQL) storage: className: longhorn # TODO: 同 infra-values diff --git a/environments/mxinit/agents.yaml b/environments/mxinit/agents.yaml deleted file mode 100644 index 6c56358..0000000 --- a/environments/mxinit/agents.yaml +++ /dev/null @@ -1,6 +0,0 @@ -# mxinit — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-) - -agents: - - id: mxinit - description: mxinit Agent - phaseType: DieCasting diff --git a/environments/mxinit/edges.yaml b/environments/mxinit/edges.yaml deleted file mode 100644 index dc46722..0000000 --- a/environments/mxinit/edges.yaml +++ /dev/null @@ -1,13 +0,0 @@ -# mxinit — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-) -# idWorkerId 全平台唯一(1-63);demo 占用 17-18,tuopu-01 占用 21-22,sanhua 占 31,mxinit 占 41 - -edges: - - id: mxinit - idWorkerId: 41 - description: mxinit 主 Edge(母盘) - # ADS Router 本方身份:显式分配,重启不变,绝不从 Pod IP 推导。 - # localNetId 第 4 字节与 idWorkerId 对齐便于记忆。 - adsRouter: - localNetId: "10.200.0.41.1.1" - # 母盘机 enp1s0f0 当前 DHCP 地址;克隆分发后必须按现场出口源地址更新。 - publicAddress: "192.168.1.247"