feat(chart): _frontend/_postgres affinity 合并 + audit/shared-infra 注入 + bump 1.2.0
Tasks 10-11: podAffinity+nodeAffinity 合并到同一 affinity 块; audit/shared-infra 走 tier;Chart.yaml 1.1.0→1.2.0。
This commit is contained in:
1 parent
e0d680d67c
commit
132285c253
6 files changed
+33
-9
No files matched your search
+13
-2
@@ -40,8 +40,10 @@ spec:
|
||||
labels:
|
||||
app.kubernetes.io/component: {{ .name }}-postgres
|
||||
spec:
|
||||
{{- if .affinity }}
|
||||
# 四胞胎:postgres 必须和后端 Pod 同节点
|
||||
{{- if .nodeName }}
|
||||
nodeName: {{ .nodeName }}
|
||||
{{- else if .affinity }}
|
||||
# 四胞胎:postgres 必须和后端 Pod 同节点(podAffinity + 点位/tier nodeAffinity 合并到同一 affinity 块)
|
||||
affinity:
|
||||
podAffinity:
|
||||
requiredDuringSchedulingIgnoredDuringExecution:
|
||||
@@ -49,6 +51,15 @@ spec:
|
||||
matchLabels:
|
||||
app.kubernetes.io/component: {{ .name }}
|
||||
topologyKey: kubernetes.io/hostname
|
||||
{{- if .pointAffinity }}
|
||||
{{ include "mixingx.pointNodeAffinity" (dict "affinity" .pointAffinity "root" $root) }}
|
||||
{{- else if and $root.Values.tier $root.Values.tier.enabled }}
|
||||
{{ include "mixingx.tierNodeAffinity" (dict "role" .tierRole "root" $root) }}
|
||||
{{- end }}
|
||||
{{- else if .pointAffinity }}
|
||||
{{ include "mixingx.pointAffinity" (dict "affinity" .pointAffinity "root" $root) }}
|
||||
{{- else if and $root.Values.tier $root.Values.tier.enabled }}
|
||||
{{ include "mixingx.tierAffinity" (dict "role" .tierRole "root" $root) }}
|
||||
{{- end }}
|
||||
containers:
|
||||
- name: postgres
|
||||
|
||||
Reference in new issue
Block a user