release: thai 环境更名 thai-tuopu-2000-4(泰国多项目,国家名不可作环境名);chart/image 对齐 sanhua v1.0.45
This commit is contained in:
1 parent
94a509b285
commit
ce181d8a7c
29 files changed
+107
-107
No files matched your search
@@ -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
|
||||||
@@ -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
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: ApplicationSet
|
kind: ApplicationSet
|
||||||
metadata:
|
metadata:
|
||||||
name: mixingx-thai-agents
|
name: mixingx-thai-tuopu-2000-4-agents
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
spec:
|
spec:
|
||||||
goTemplate: true
|
goTemplate: true
|
||||||
@@ -15,7 +15,7 @@ spec:
|
|||||||
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
revision: release
|
revision: release
|
||||||
files:
|
files:
|
||||||
- path: environments/thai/agents.yaml
|
- path: environments/thai-tuopu-2000-4/agents.yaml
|
||||||
- list:
|
- list:
|
||||||
elementsYaml: '{{ .agents | toJson }}'
|
elementsYaml: '{{ .agents | toJson }}'
|
||||||
template:
|
template:
|
||||||
@@ -25,14 +25,14 @@ spec:
|
|||||||
project: default
|
project: default
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
|
- 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
|
path: release-charts/mixingx-agent-unit
|
||||||
helm:
|
helm:
|
||||||
releaseName: 'mixingx-agent-{{ .id }}'
|
releaseName: 'mixingx-agent-{{ .id }}'
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/agent-common-values.yaml
|
- $values/environments/thai-tuopu-2000-4/agent-common-values.yaml
|
||||||
values: |
|
values: |
|
||||||
site: "{{ .id }}"
|
site: "{{ .id }}"
|
||||||
description: "{{ .description }}"
|
description: "{{ .description }}"
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# thai — mixingx-audit(客户环境 Application,ADR-0068)
|
# thai-tuopu-2000-4 — mixingx-audit(客户环境 Application,ADR-0068)
|
||||||
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 /
|
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 /
|
||||||
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
@@ -16,8 +16,8 @@ spec:
|
|||||||
releaseName: mixingx-audit
|
releaseName: mixingx-audit
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/audit-values.yaml
|
- $values/environments/thai-tuopu-2000-4/audit-values.yaml
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -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
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: ApplicationSet
|
kind: ApplicationSet
|
||||||
metadata:
|
metadata:
|
||||||
name: mixingx-thai-edges
|
name: mixingx-thai-tuopu-2000-4-edges
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
spec:
|
spec:
|
||||||
goTemplate: true
|
goTemplate: true
|
||||||
@@ -15,7 +15,7 @@ spec:
|
|||||||
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
revision: release
|
revision: release
|
||||||
files:
|
files:
|
||||||
- path: environments/thai/edges.yaml
|
- path: environments/thai-tuopu-2000-4/edges.yaml
|
||||||
- list:
|
- list:
|
||||||
elementsYaml: '{{ .edges | toJson }}'
|
elementsYaml: '{{ .edges | toJson }}'
|
||||||
template:
|
template:
|
||||||
@@ -31,8 +31,8 @@ spec:
|
|||||||
releaseName: 'mixingx-edge-{{ .id }}'
|
releaseName: 'mixingx-edge-{{ .id }}'
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/edge-common-values.yaml
|
- $values/environments/thai-tuopu-2000-4/edge-common-values.yaml
|
||||||
values: |
|
values: |
|
||||||
site: "{{ .id }}"
|
site: "{{ .id }}"
|
||||||
idWorkerId: {{ .idWorkerId }}
|
idWorkerId: {{ .idWorkerId }}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# thai — mixingx-gateway(客户环境 Application,ADR-0068)
|
# thai-tuopu-2000-4 — mixingx-gateway(客户环境 Application,ADR-0068)
|
||||||
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 /
|
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 /
|
||||||
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
@@ -16,8 +16,8 @@ spec:
|
|||||||
releaseName: mixingx-gateway
|
releaseName: mixingx-gateway
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/gateway-values.yaml
|
- $values/environments/thai-tuopu-2000-4/gateway-values.yaml
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# thai — mixingx-infra(客户环境 Application,ADR-0068)
|
# thai-tuopu-2000-4 — mixingx-infra(客户环境 Application,ADR-0068)
|
||||||
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 /
|
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 /
|
||||||
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
@@ -10,14 +10,14 @@ spec:
|
|||||||
project: default
|
project: default
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
|
- 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
|
path: release-charts/mixingx-infra
|
||||||
helm:
|
helm:
|
||||||
releaseName: mixingx-infra
|
releaseName: mixingx-infra
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/infra-values.yaml
|
- $values/environments/thai-tuopu-2000-4/infra-values.yaml
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
# thai — MQTTX 调试客户端
|
# thai-tuopu-2000-4 — MQTTX 调试客户端
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
metadata:
|
metadata:
|
||||||
@@ -8,13 +8,13 @@ spec:
|
|||||||
project: default
|
project: default
|
||||||
sources:
|
sources:
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.hub.chart.git
|
- 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
|
path: release-charts/mixingx-mqttx
|
||||||
helm:
|
helm:
|
||||||
releaseName: mixingx-mqttx
|
releaseName: mixingx-mqttx
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $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
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
+1
-1
@@ -13,7 +13,7 @@ spec:
|
|||||||
releaseName: mixingx-network-agent
|
releaseName: mixingx-network-agent
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $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
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -1,14 +1,14 @@
|
|||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
metadata:
|
metadata:
|
||||||
name: thai-root
|
name: thai-tuopu-2000-4-root
|
||||||
namespace: argocd
|
namespace: argocd
|
||||||
spec:
|
spec:
|
||||||
project: default
|
project: default
|
||||||
source:
|
source:
|
||||||
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
path: applications/thai
|
path: applications/thai-tuopu-2000-4
|
||||||
directory:
|
directory:
|
||||||
exclude: "root.yaml"
|
exclude: "root.yaml"
|
||||||
destination:
|
destination:
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# thai — mixingx-sso(客户环境 Application,ADR-0068)
|
# thai-tuopu-2000-4 — mixingx-sso(客户环境 Application,ADR-0068)
|
||||||
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 /
|
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 /
|
||||||
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
@@ -16,8 +16,8 @@ spec:
|
|||||||
releaseName: mixingx-sso
|
releaseName: mixingx-sso
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/sso-values.yaml
|
- $values/environments/thai-tuopu-2000-4/sso-values.yaml
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
# thai — mixingx-ultra(客户环境 Application,ADR-0068)
|
# thai-tuopu-2000-4 — mixingx-ultra(客户环境 Application,ADR-0068)
|
||||||
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai / deploy 钉 release 分支 /
|
# 与 demo 的差异:chart 钉 chart tag / values 来自 _common+thai-tuopu-2000-4 / deploy 钉 release 分支 /
|
||||||
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
# automated+selfHeal(现场无人值守,push 即升级)/ prune 关(防误删硬件绑定资源)
|
||||||
apiVersion: argoproj.io/v1alpha1
|
apiVersion: argoproj.io/v1alpha1
|
||||||
kind: Application
|
kind: Application
|
||||||
@@ -16,8 +16,8 @@ spec:
|
|||||||
releaseName: mixingx-ultra
|
releaseName: mixingx-ultra
|
||||||
valueFiles:
|
valueFiles:
|
||||||
- $values/environments/_common/registry.yaml
|
- $values/environments/_common/registry.yaml
|
||||||
- $values/environments/thai/image-version.yaml
|
- $values/environments/thai-tuopu-2000-4/image-version.yaml
|
||||||
- $values/environments/thai/ultra-values.yaml
|
- $values/environments/thai-tuopu-2000-4/ultra-values.yaml
|
||||||
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
- repoURL: https://gitee.com/mixing-tech/mixingx.deploy.git
|
||||||
targetRevision: release
|
targetRevision: release
|
||||||
ref: values
|
ref: values
|
||||||
@@ -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
|
|
||||||
+3
-3
@@ -1,8 +1,8 @@
|
|||||||
# thai — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加)
|
# thai-tuopu-2000-4 — Agent 单元公共 values(ApplicationSet 为每个 agent 实例叠加)
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: longhorn # TODO: 同 infra-values
|
className: longhorn # TODO: 同 infra-values
|
||||||
size: 50Gi # thai 机根分区仅 98G(sanhua 是 936G 才给 200Gi)
|
size: 50Gi # thai-tuopu-2000-4 机根分区仅 98G(sanhua 是 936G 才给 200Gi)
|
||||||
keep: true
|
keep: true
|
||||||
|
|
||||||
images:
|
images:
|
||||||
@@ -34,7 +34,7 @@ sharedInfra:
|
|||||||
|
|
||||||
# MQTT 凭据:对齐 demo 模式(credentialRef = edge-<edgeId>-mqtt;NanoMQ 匿名,账号留空)
|
# MQTT 凭据:对齐 demo 模式(credentialRef = edge-<edgeId>-mqtt;NanoMQ 匿名,账号留空)
|
||||||
mqttCredentials:
|
mqttCredentials:
|
||||||
- credentialRef: "edge-thai-mqtt"
|
- credentialRef: "edge-thai-tuopu-2000-4-mqtt"
|
||||||
username: ""
|
username: ""
|
||||||
password: ""
|
password: ""
|
||||||
|
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
# thai-tuopu-2000-4 — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-<id>)
|
||||||
|
|
||||||
|
agents:
|
||||||
|
- id: thai-tuopu-2000-4
|
||||||
|
description: thai-tuopu-2000-4 Agent
|
||||||
|
phaseType: DieCasting
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# thai — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065)
|
# thai-tuopu-2000-4 — Audit(审计服务 + audit broker(NanoMQ)+ 专属 PostgreSQL,ADR-0065)
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: longhorn # TODO: 同 infra-values
|
className: longhorn # TODO: 同 infra-values
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# thai — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加)
|
# thai-tuopu-2000-4 — Edge 单元公共 values(ApplicationSet 为每个 edge 实例叠加)
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: longhorn # TODO: edge 配置存储的 SC;若现场用 local-path 则替换
|
className: longhorn # TODO: edge 配置存储的 SC;若现场用 local-path 则替换
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# thai-tuopu-2000-4 — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-<id>)
|
||||||
|
# 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
|
||||||
@@ -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
|
||||||
+2
-2
@@ -1,4 +1,4 @@
|
|||||||
# thai — 网关
|
# thai-tuopu-2000-4 — 网关
|
||||||
#
|
#
|
||||||
# ⚠️ 现场核对项:
|
# ⚠️ 现场核对项:
|
||||||
# - 暴露方式:现场无 *.mixingx.local DNS,ingress 默认关闭;
|
# - 暴露方式:现场无 *.mixingx.local DNS,ingress 默认关闭;
|
||||||
@@ -27,7 +27,7 @@ gateway:
|
|||||||
rbac: true
|
rbac: true
|
||||||
|
|
||||||
# 暴露方式:chart 的标准 Ingress 不支持 IP 作 host(K8s 校验拒绝),
|
# 暴露方式:chart 的标准 Ingress 不支持 IP 作 host(K8s 校验拒绝),
|
||||||
# 现场以 Traefik IngressRoute(Host <thai 现场 IP>)手工落;
|
# 现场以 Traefik IngressRoute(Host <thai-tuopu-2000-4 现场 IP>)手工落;
|
||||||
# TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps
|
# TODO(chart): ingress 模板增加 IngressRoute/可选 host 支持,后续版本纳入 GitOps
|
||||||
ingress:
|
ingress:
|
||||||
enabled: false
|
enabled: false
|
||||||
+2
-2
@@ -29,7 +29,7 @@ images:
|
|||||||
tag: v1.0.42
|
tag: v1.0.42
|
||||||
agent:
|
agent:
|
||||||
repository: agent
|
repository: agent
|
||||||
tag: v1.0.44
|
tag: develop-v.1.0.1-202609290125-137
|
||||||
agentWeb:
|
agentWeb:
|
||||||
repository: agent-web
|
repository: agent-web
|
||||||
tag: v1.0.44
|
tag: develop-v.1.0.1-202609290125-137
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# thai — 共享基础设施(redis / rabbitmq)
|
# thai-tuopu-2000-4 — 共享基础设施(redis / rabbitmq)
|
||||||
#
|
#
|
||||||
# ⚠️ 现场核对项:
|
# ⚠️ 现场核对项:
|
||||||
# - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认
|
# - storage.className: 现场底座 Longhorn 的默认 SC 名(预计 longhorn),装好后 kubectl get sc 确认
|
||||||
+4
-4
@@ -1,15 +1,15 @@
|
|||||||
# thai — MQTTX Web(MQTT 调试客户端)
|
# thai-tuopu-2000-4 — MQTTX Web(MQTT 调试客户端)
|
||||||
#
|
#
|
||||||
# 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。
|
# 用途:浏览器直连各 Edge 的 NanoMQ(ws://),监控/调试 MQTT 流量。
|
||||||
# 暴露:Traefik 专用入口 mqttx(:8082,<thai 现场 IP>)——IngressRoute 现场手工落,
|
# 暴露:Traefik 专用入口 mqttx(:8082,<thai-tuopu-2000-4 现场 IP>)——IngressRoute 现场手工落,
|
||||||
# chart ingress 关闭(标准 Ingress 不收 IP host,见 gateway-values 同款注释)。
|
# chart ingress 关闭(标准 Ingress 不收 IP host,见 gateway-values 同款注释)。
|
||||||
# 连接目标 Edge NanoMQ 的方式:把目标 edge 的 NanoMQ Service 临时改 NodePort 并声明 ws 端口
|
# 连接目标 Edge NanoMQ 的方式:把目标 edge 的 NanoMQ Service 临时改 NodePort 并声明 ws 端口
|
||||||
# (kubectl patch svc edge-thai-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:<NodePort>/mqtt
|
# (kubectl patch svc edge-thai-tuopu-2000-4-nanomq-service -p ...),MQTTX 里填 ws://<现场IP>:<NodePort>/mqtt
|
||||||
|
|
||||||
mqttx:
|
mqttx:
|
||||||
name: mqttx
|
name: mqttx
|
||||||
replicas: 1
|
replicas: 1
|
||||||
description: "MQTT 监控客户端 (thai)"
|
description: "MQTT 监控客户端 (thai-tuopu-2000-4)"
|
||||||
image:
|
image:
|
||||||
# 显式 ACR 引用(ADR-0066);latest + IfNotPresent:首次拉取后固定,不再漂移
|
# 显式 ACR 引用(ADR-0066);latest + IfNotPresent:首次拉取后固定,不再漂移
|
||||||
repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/mqttx-web
|
repository: mx-imserver-registry.cn-shanghai.cr.aliyuncs.com/library/mqttx-web
|
||||||
+1
-1
@@ -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。
|
# 镜像地址的 registry 由 image-version.yaml 顶层提供(ACR);此处只钉 tag。
|
||||||
image:
|
image:
|
||||||
tag: develop-v.1.0.1-202609100650-37
|
tag: develop-v.1.0.1-202609100650-37
|
||||||
File renamed without changes.
@@ -1,4 +1,4 @@
|
|||||||
# thai — SSO(后端 + web + 专属 PostgreSQL)
|
# thai-tuopu-2000-4 — SSO(后端 + web + 专属 PostgreSQL)
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: longhorn # TODO: 同 infra-values
|
className: longhorn # TODO: 同 infra-values
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
# thai — Ultra 看板(后端 + web + 专属 PostgreSQL)
|
# thai-tuopu-2000-4 — Ultra 看板(后端 + web + 专属 PostgreSQL)
|
||||||
|
|
||||||
storage:
|
storage:
|
||||||
className: longhorn # TODO: 同 infra-values
|
className: longhorn # TODO: 同 infra-values
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
# thai — Agent 单元清单(ApplicationSet 据此生成 mixingx-agent-<id>)
|
|
||||||
|
|
||||||
agents:
|
|
||||||
- id: thai
|
|
||||||
description: thai Agent
|
|
||||||
phaseType: DieCasting
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
# thai — Edge 单元清单(ApplicationSet 据此生成 mixingx-edge-<id>)
|
|
||||||
# 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
|
|
||||||
@@ -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
|
|
||||||
Reference in new issue
Block a user