- mixingx-agent-unit: values 加 phaseType 字段,unit.yaml ConfigMap 渲染 AGENT_PHASE_TYPE - 根 chart _backend.tpl: agent 分支渲染 AGENT_PHASE_TYPE - 根 chart instances.yaml: 遍历 agents 时透传 phaseType - 空 phaseType 不渲染(向后兼容) 对应 apphost.cs WithPhaseType 扩展,k8s 部署侧此前缺失此环境变量, 导致 agent 启动读不到工序类型,触发 ultra 阶段6 扫码校验 Fail。
55 lines
2.9 KiB
YAML
55 lines
2.9 KiB
YAML
{{/*
|
|
Agent 点位 — 遍历 .Values.agents 数组,每个元素生成完整的三件套
|
|
生成: 后端 Deployment/Service/ConfigMap/Secret + 前端 Deployment/Service + 独立 Postgres StatefulSet/Service/PVC
|
|
三者通过 podAffinity 强制同节点
|
|
点位元素可为字符串(老 "0")或对象(新 {site, nodeName?, nodeAffinity?})
|
|
*/}}
|
|
{{- range $raw := .Values.agents }}
|
|
{{- $site := "" -}}
|
|
{{- $nodeName := "" -}}
|
|
{{- $pointAffinity := "" -}}
|
|
{{- $phaseType := "" -}}
|
|
{{- if kindIs "map" $raw -}}
|
|
{{- $site = $raw.site | default "" -}}
|
|
{{- $nodeName = $raw.nodeName | default "" -}}
|
|
{{- $pointAffinity = $raw.nodeAffinity | default "" -}}
|
|
{{- $phaseType = $raw.phaseType | default "" -}}
|
|
{{- else -}}
|
|
{{- $site = $raw | toString -}}
|
|
{{- end -}}
|
|
{{- $instName := printf "agent-%s" $site }}
|
|
{{- $webName := printf "agent-web-%s" $site }}
|
|
{{- $dbName := printf "agent-db-%s" $site }}
|
|
{{- $basePath := printf "/agent-%s" $site }}
|
|
{{- $description := printf "Agent 实例 %s" $site }}
|
|
# ═══ 实例: {{ $instName }} ({{ $description }}) ═══
|
|
{{ include "mixingx.backend" (dict "name" $instName "image" "agent" "role" "agent" "serviceId" $instName "phaseType" $phaseType "database" $dbName "description" $description "nodeName" $nodeName "pointAffinity" $pointAffinity "root" $) }}
|
|
{{ include "mixingx.frontend" (dict "name" $webName "image" "agent-web" "basePath" $basePath "affinity" $instName "nodeName" $nodeName "pointAffinity" $pointAffinity "tierRole" "agent" "root" $) }}
|
|
{{ include "mixingx.postgres" (dict "name" $instName "database" $dbName "pgStorage" "5Gi" "affinity" true "nodeName" $nodeName "pointAffinity" $pointAffinity "tierRole" "agent" "root" $) }}
|
|
{{- end }}
|
|
|
|
{{/*
|
|
Edge 点位 — 遍历 .Values.edges 数组,逻辑同上
|
|
*/}}
|
|
{{- range $raw := .Values.edges }}
|
|
{{- $site := "" -}}
|
|
{{- $nodeName := "" -}}
|
|
{{- $pointAffinity := "" -}}
|
|
{{- if kindIs "map" $raw -}}
|
|
{{- $site = $raw.site | default "" -}}
|
|
{{- $nodeName = $raw.nodeName | default "" -}}
|
|
{{- $pointAffinity = $raw.nodeAffinity | default "" -}}
|
|
{{- else -}}
|
|
{{- $site = $raw | toString -}}
|
|
{{- end -}}
|
|
{{- $instName := printf "edge-%s" $site }}
|
|
{{- $webName := printf "edge-web-%s" $site }}
|
|
{{- $dbName := printf "edge-db-%s" $site }}
|
|
{{- $basePath := printf "/edge-%s" $site }}
|
|
{{- $description := printf "Edge 实例 %s" $site }}
|
|
# ═══ 实例: {{ $instName }} ({{ $description }}) ═══
|
|
{{ include "mixingx.backend" (dict "name" $instName "image" "edge" "role" "edge" "serviceId" $instName "database" $dbName "description" $description "nodeName" $nodeName "pointAffinity" $pointAffinity "root" $) }}
|
|
{{ include "mixingx.frontend" (dict "name" $webName "image" "edge-web" "basePath" $basePath "affinity" $instName "nodeName" $nodeName "pointAffinity" $pointAffinity "tierRole" "edge" "root" $) }}
|
|
{{ include "mixingx.postgres" (dict "name" $instName "database" $dbName "pgStorage" "5Gi" "affinity" true "nodeName" $nodeName "pointAffinity" $pointAffinity "tierRole" "edge" "root" $) }}
|
|
{{- end }}
|