feat(chart): instances/standalones 改 range 循环 + 全部镜像加时区
== helm chart 标准化 == - instances/standalones: 写死文件 → range 循环(加/删点位只改 values) - values 加 webName(显式前端名)+ description(Gateway 中文展示名) - _backend.tpl: Service 加 mixingx.io/description annotation + 补 ultra serviceId - _frontend.tpl/audit.yaml/mock.yaml: 注入 TZ env - values 加 timezone 变量(部署地域可覆盖,默认 Asia/Shanghai) - 修 app-ingress.yaml gatewayService/gatewayPort undefined bug - 验证: helm diff 资源数一致(61=61),加 agent-beijing 点位 8 资源全部正确生成 == 12 个 Dockerfile 加时区 == 后端(.NET debian): apt-get tzdata + ln /etc/localtime + ENV TZ 前端(nginx alpine): apk add tzdata audit(node alpine): apk add tzdata mock(opcua/s7): 同上 镜像内置 Asia/Shanghai 兜底 + helm TZ env 覆盖 = 双保险 == submodule Dockerfile 重写 == agent/edge/ultra: 重写适配 hub 根 context(含 ServiceDefaults 跨仓库引用) sso/gateway: 加时区 == submodule 指针更新 == 7 个 submodule 指针全部更新
This commit is contained in:
1 parent
f69c4161b5
commit
8ffc6ee825
11 files changed
+85
-50
No files matched your search
+27
@@ -7,6 +7,10 @@
|
||||
registry: 192.168.1.105:8888/mixingx
|
||||
tag: latest
|
||||
|
||||
# 时区(部署地域覆盖):中国 Asia/Shanghai,海外按需改如 America/New_York
|
||||
# 注入所有容器的 TZ env,覆盖镜像内默认时区(镜像内置 Asia/Shanghai 兜底)
|
||||
timezone: Asia/Shanghai
|
||||
|
||||
# ── 共享基础设施(所有服务连同一个) ──
|
||||
sharedInfra:
|
||||
postgres: # postgres 连接参数(每个独立 postgres 共用)
|
||||
@@ -41,23 +45,40 @@ instances:
|
||||
- name: agent-0
|
||||
image: agent
|
||||
role: agent
|
||||
webName: agent-web-0 # 前端服务名(显式,因为命名不统一:agent-web-0 / ultra-web)
|
||||
webImage: agent-web
|
||||
webBasePath: /agent-0/
|
||||
serviceId: agent-0
|
||||
database: agent-db-0
|
||||
pgStorage: 5Gi
|
||||
description: "Agent 实例 0" # Gateway 中文展示名(mixingx.io/description annotation)
|
||||
affinity: true # 前端和 DB 必须和后端同节点
|
||||
|
||||
- name: edge-0
|
||||
image: edge
|
||||
role: edge
|
||||
webName: edge-web-0
|
||||
webImage: edge-web
|
||||
webBasePath: /edge-0/
|
||||
serviceId: edge-0
|
||||
database: edge-db-0
|
||||
pgStorage: 5Gi
|
||||
description: "Edge 实例 0"
|
||||
affinity: true
|
||||
|
||||
# 加点位示例(取消注释 + helm upgrade 即生效):
|
||||
# - name: agent-beijing
|
||||
# image: agent
|
||||
# role: agent
|
||||
# webName: agent-web-beijing
|
||||
# webImage: agent-web
|
||||
# webBasePath: /agent-beijing/
|
||||
# serviceId: agent-beijing
|
||||
# database: agent-db-beijing
|
||||
# pgStorage: 5Gi
|
||||
# description: "北京厂区 注塑车间"
|
||||
# affinity: true
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 类型 B:独立不亲和(sso/ultra)— 后端+前端+独立DB,无亲和,多副本
|
||||
# 固定数量,不动态添加
|
||||
@@ -66,21 +87,25 @@ standalones:
|
||||
- name: sso
|
||||
image: sso
|
||||
role: sso
|
||||
webName: sso-web
|
||||
webImage: sso-web
|
||||
webBasePath: /sso/
|
||||
serviceId: sso
|
||||
database: sso-db
|
||||
pgStorage: 10Gi
|
||||
description: "统一登录"
|
||||
replicas: 2
|
||||
affinity: false
|
||||
|
||||
- name: ultra
|
||||
image: ultra
|
||||
role: ultra
|
||||
webName: ultra-web
|
||||
webImage: ultra-web
|
||||
webBasePath: /ultra/
|
||||
database: ultra-db
|
||||
pgStorage: 10Gi
|
||||
description: "Ultra 看板"
|
||||
replicas: 2
|
||||
affinity: false
|
||||
|
||||
@@ -139,3 +164,5 @@ mocks:
|
||||
ingress:
|
||||
enabled: true
|
||||
domain: app.mixingx.local
|
||||
gatewayService: gateway-service # 所有流量 → gateway,由 gateway 动态路由
|
||||
gatewayPort: 8080
|
||||
Reference in new issue
Block a user