feat(chart): tier + pointAffinity 模板 + values 块(三层优先级 nodeName>point>tier)
Tasks 5-9: _tier-affinity.tpl + _point-affinity.tpl + values tier 块 + _backend.tpl 三层注入 + instances.yaml 解析 Point 对象。
This commit is contained in:
1 parent
92fcbf7096
commit
e0d680d67c
5 files changed
+217
-9
No files matched your search
@@ -41,6 +41,13 @@ spec:
|
||||
{{- if .rbac }}
|
||||
serviceAccountName: gateway-sa
|
||||
{{- end }}
|
||||
{{- if .nodeName }}
|
||||
nodeName: {{ .nodeName }}
|
||||
{{- else if .pointAffinity }}
|
||||
{{ include "mixingx.pointAffinity" (dict "affinity" .pointAffinity "root" .root) }}
|
||||
{{- else }}
|
||||
{{ include "mixingx.tierAffinity" (dict "role" .role "root" .root) }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: {{ .name }}
|
||||
image: {{ $root.Values.registry }}/{{ .image }}:{{ $root.Values.tag | default "latest" }}
|
||||
|
||||
@@ -0,0 +1,81 @@
|
||||
{{/*
|
||||
渲染点位级原生 nodeAffinity — 完整 affinity 块。
|
||||
三层优先级的中层:点位配了 nodeAffinity 时覆盖全局 tier(被 nodeName 覆盖)。
|
||||
|
||||
参数:
|
||||
affinity - Point 对象的 nodeAffinity 字段 {required?: [...], preferred?: [...]}
|
||||
root - $ (root context)
|
||||
*/}}
|
||||
{{- define "mixingx.pointAffinity" -}}
|
||||
{{- $aff := .affinity -}}
|
||||
affinity:
|
||||
nodeAffinity:
|
||||
{{- with $aff.required }}
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
nodeSelectorTerms:
|
||||
{{- range . }}
|
||||
- matchExpressions:
|
||||
- key: {{ .key }}
|
||||
operator: {{ .operator }}
|
||||
{{- if .values }}
|
||||
values:
|
||||
{{- range .values }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with $aff.preferred }}
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
{{- range . }}
|
||||
- weight: {{ .weight }}
|
||||
preference:
|
||||
matchExpressions:
|
||||
- key: {{ .key }}
|
||||
operator: {{ .operator }}
|
||||
{{- if .values }}
|
||||
values:
|
||||
{{- range .values }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{/* 只渲染 nodeAffinity 子块(供 frontend/postgres 合并 podAffinity 用)*/}}
|
||||
{{- define "mixingx.pointNodeAffinity" -}}
|
||||
{{- $aff := .affinity -}}
|
||||
nodeAffinity:
|
||||
{{- with $aff.required }}
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
nodeSelectorTerms:
|
||||
{{- range . }}
|
||||
- matchExpressions:
|
||||
- key: {{ .key }}
|
||||
operator: {{ .operator }}
|
||||
{{- if .values }}
|
||||
values:
|
||||
{{- range .values }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with $aff.preferred }}
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
{{- range . }}
|
||||
- weight: {{ .weight }}
|
||||
preference:
|
||||
matchExpressions:
|
||||
- key: {{ .key }}
|
||||
operator: {{ .operator }}
|
||||
{{- if .values }}
|
||||
values:
|
||||
{{- range .values }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -0,0 +1,80 @@
|
||||
{{/*
|
||||
渲染全局 tier 档位调度 nodeAffinity — 完整 affinity 块(无现成 affinity 的模板用)。
|
||||
三层优先级的最底层(点位 nodeName > 点位 nodeAffinity > 全局 tier)。
|
||||
|
||||
参数:
|
||||
role - 服务角色(gateway/sso/ultra/agent/edge/audit/sharedDatastores)
|
||||
root - $ (root context)
|
||||
*/}}
|
||||
{{- define "mixingx.tierAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $cfg := $root.Values.tier -}}
|
||||
{{- if and $cfg $cfg.enabled -}}
|
||||
{{- $svc := index $cfg.services .role -}}
|
||||
{{- if $svc -}}
|
||||
{{- $label := $cfg.nodeLabel | default "mixingx.io/tier" -}}
|
||||
{{- if eq $svc.mode "required" }}
|
||||
affinity:
|
||||
nodeAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
nodeSelectorTerms:
|
||||
- matchExpressions:
|
||||
- key: {{ $label }}
|
||||
operator: In
|
||||
values:
|
||||
{{- range $svc.tiers }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- else if eq $svc.mode "preferred" }}
|
||||
affinity:
|
||||
nodeAffinity:
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
{{- range $svc.tiers }}
|
||||
- weight: 100
|
||||
preference:
|
||||
matchExpressions:
|
||||
- key: {{ $label }}
|
||||
operator: In
|
||||
values:
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{/* 只渲染 nodeAffinity 子块(供 frontend/postgres 合并 podAffinity 用)*/}}
|
||||
{{- define "mixingx.tierNodeAffinity" -}}
|
||||
{{- $root := .root -}}
|
||||
{{- $cfg := $root.Values.tier -}}
|
||||
{{- if and $cfg $cfg.enabled -}}
|
||||
{{- $svc := index $cfg.services .role -}}
|
||||
{{- if $svc -}}
|
||||
{{- $label := $cfg.nodeLabel | default "mixingx.io/tier" -}}
|
||||
{{- if eq $svc.mode "required" }}
|
||||
nodeAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
nodeSelectorTerms:
|
||||
- matchExpressions:
|
||||
- key: {{ $label }}
|
||||
operator: In
|
||||
values:
|
||||
{{- range $svc.tiers }}
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- else if eq $svc.mode "preferred" }}
|
||||
nodeAffinity:
|
||||
preferredDuringSchedulingIgnoredDuringExecution:
|
||||
{{- range $svc.tiers }}
|
||||
- weight: 100
|
||||
preference:
|
||||
matchExpressions:
|
||||
- key: {{ $label }}
|
||||
operator: In
|
||||
values:
|
||||
- {{ . | quote }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -2,30 +2,51 @@
|
||||
Agent 点位 — 遍历 .Values.agents 数组,每个元素生成完整的三件套
|
||||
生成: 后端 Deployment/Service/ConfigMap/Secret + 前端 Deployment/Service + 独立 Postgres StatefulSet/Service/PVC
|
||||
三者通过 podAffinity 强制同节点
|
||||
点位元素可为字符串(老 "0")或对象(新 {site, nodeName?, nodeAffinity?})
|
||||
*/}}
|
||||
{{- range $site := .Values.agents }}
|
||||
{{- range $raw := .Values.agents }}
|
||||
{{- $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 "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 "database" $dbName "description" $description "root" $) }}
|
||||
{{ include "mixingx.frontend" (dict "name" $webName "image" "agent-web" "basePath" $basePath "affinity" $instName "root" $) }}
|
||||
{{ include "mixingx.postgres" (dict "name" $instName "database" $dbName "pgStorage" "5Gi" "affinity" true "root" $) }}
|
||||
{{ include "mixingx.backend" (dict "name" $instName "image" "agent" "role" "agent" "serviceId" $instName "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 $site := .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 "root" $) }}
|
||||
{{ include "mixingx.frontend" (dict "name" $webName "image" "edge-web" "basePath" $basePath "affinity" $instName "root" $) }}
|
||||
{{ include "mixingx.postgres" (dict "name" $instName "database" $dbName "pgStorage" "5Gi" "affinity" true "root" $) }}
|
||||
{{ 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 }}
|
||||
+20
-1
@@ -43,7 +43,7 @@ sharedInfra:
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 点位配置 — 只写名字,模板自动推导其余字段
|
||||
# 格式: agents/edges 为字符串数组,每个元素为点位后缀
|
||||
# 格式: agents/edges 元素可为字符串(老格式 "0")或对象(新格式 {site, tierOverride/nodeAffinity, nodeName})
|
||||
# 生成规则:
|
||||
# 后端: {role}-{site} 如 agent-0, agent-beijing
|
||||
# 前端: {role}-web-{site} 如 agent-web-0, agent-web-beijing
|
||||
@@ -60,6 +60,25 @@ edges:
|
||||
- "0"
|
||||
# - guangzhou
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 节点档位调度(可选)— 按硬件能力把服务分配到相应 node
|
||||
# 前提:给集群节点打 label kubectl label node <name> mixingx.io/tier=<infra|perf|edge>
|
||||
# infra=基础设施级(最强) perf=性能级(中等) edge=边缘级(最弱)
|
||||
# enabled=false 时完全不渲染调度(默认,向后兼容)
|
||||
# 点位级覆盖:agents/edges 元素可用对象格式 {site, nodeName?, nodeAffinity?} 覆盖
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
tier:
|
||||
enabled: false
|
||||
nodeLabel: mixingx.io/tier
|
||||
services:
|
||||
gateway: { mode: required, tiers: [infra] }
|
||||
sso: { mode: required, tiers: [infra] }
|
||||
ultra: { mode: required, tiers: [infra] }
|
||||
audit: { mode: required, tiers: [infra] }
|
||||
sharedDatastores: { mode: required, tiers: [infra] }
|
||||
agent: { mode: preferred, tiers: [perf, infra] }
|
||||
edge: { mode: preferred, tiers: [edge, perf, infra] }
|
||||
|
||||
# ═══════════════════════════════════════════════════════════════
|
||||
# 类型 B:独立不亲和(sso/ultra)— 后端+前端+独立DB,无亲和,多副本
|
||||
# 固定数量,不动态添加
|
||||
|
||||
Reference in new issue
Block a user