feat(cloudnativePG): support topologySpreadConstraints
Bash / shellcheck (push) Successful in 7s
Bash / bash-unittest (push) Successful in 25s
changelog / changelog (push) Successful in 15s
Helm / helm-lint (push) Successful in 13s
Helm / helm-unittest (push) Successful in 20s
Markdown linter / markdown-lint (push) Successful in 18s
Markdown linter / markdown-link-checker (push) Successful in 52s

A HA `Cluster` is only actually highly available if its instances end up in different failure domains. Pod
anti-affinity alone cannot express that: it only keeps the instances off the same node, not off the same zone,
and `cloudnativePG.affinity` has no way to encode a skew budget. Without `topologySpreadConstraints` a three
instance cluster can legitimately be scheduled into a single availability zone, where a zone outage takes down
the primary and both replicas at once.

Both `affinity` and `topologySpreadConstraints` are rendered only when they are set. The CloudNativePG API
declares them as `omitempty`, so an empty `{}` or `[]` in the manifest would show up as a permanent diff against
the state the operator writes back.

Tolerations deliberately do not get a dedicated value. CloudNativePG has no `spec.tolerations`, it nests them
below `spec.affinity.tolerations`, so they are configured through `cloudnativePG.affinity` like `nodeSelector`
and the anti-affinity settings. A separate top-level value would only have to be folded back into the same place
and would silently conflict with a tolerations list set via `cloudnativePG.affinity`.

Co-authored-by: Copilot <copilot@github.com>
This commit is contained in:
2026-10-04 00:39:08 +02:00
co-authored by Copilot
parent 27db0d26b0
commit 6d68d44894
4 changed files with 69 additions and 8 deletions
+3 -2
View File
@@ -1387,10 +1387,11 @@ To comply with the Gitea helm chart definition of the digest parameter, a "custo
| `cloudnativePG.walStorage.enabled` | Store the write-ahead log on a dedicated volume. | `false` | | `cloudnativePG.walStorage.enabled` | Store the write-ahead log on a dedicated volume. | `false` |
| `cloudnativePG.walStorage.size` | Size of the write-ahead log volume. | `2Gi` | | `cloudnativePG.walStorage.size` | Size of the write-ahead log volume. | `2Gi` |
| `cloudnativePG.walStorage.storageClass` | Storage class of the write-ahead log volume. Defaults to the cluster's default storage class. | `""` | | `cloudnativePG.walStorage.storageClass` | Storage class of the write-ahead log volume. Defaults to the cluster's default storage class. | `""` |
| `cloudnativePG.monitoring.enablePodMonitor` | Create a `PodMonitor` for the CloudNativePG `Cluster`. | `false` | | `cloudnativePG.affinity` | Affinity for the PostgreSQL pods. CloudNativePG nests `nodeSelector` and `tolerations` below this key as well. | `{}` |
| `cloudnativePG.affinity` | Affinity for the PostgreSQL pods. | `{}` |
| `cloudnativePG.priorityClassName` | Priority class name for the PostgreSQL pods. | `""` | | `cloudnativePG.priorityClassName` | Priority class name for the PostgreSQL pods. | `""` |
| `cloudnativePG.monitoring.enablePodMonitor` | Create a `PodMonitor` for the CloudNativePG `Cluster`. | `false` |
| `cloudnativePG.resources` | Kubernetes resources for the PostgreSQL containers. | `{}` | | `cloudnativePG.resources` | Kubernetes resources for the PostgreSQL containers. | `{}` |
| `cloudnativePG.topologySpreadConstraints` | Topology spread constraints for the PostgreSQL pods. | `[]` |
### valkey ### valkey
+7 -1
View File
@@ -12,8 +12,10 @@ metadata:
name: {{ include "gitea.cluster.cloudnativePG.name" . }} name: {{ include "gitea.cluster.cloudnativePG.name" . }}
namespace: {{ .Values.namespace | default .Release.Namespace }} namespace: {{ .Values.namespace | default .Release.Namespace }}
spec: spec:
{{- with .Values.cloudnativePG.affinity }}
affinity: affinity:
{{- toYaml .Values.cloudnativePG.affinity | nindent 4 }} {{- toYaml . | nindent 4 }}
{{- end }}
bootstrap: bootstrap:
initdb: initdb:
database: {{ .Values.cloudnativePG.credentials.database | quote }} database: {{ .Values.cloudnativePG.credentials.database | quote }}
@@ -35,6 +37,10 @@ spec:
{{- with .Values.cloudnativePG.storage.storageClass }} {{- with .Values.cloudnativePG.storage.storageClass }}
storageClass: {{ . | quote }} storageClass: {{ . | quote }}
{{- end }} {{- end }}
{{- with .Values.cloudnativePG.topologySpreadConstraints }}
topologySpreadConstraints:
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.cloudnativePG.walStorage.enabled }} {{- if .Values.cloudnativePG.walStorage.enabled }}
walStorage: walStorage:
size: {{ .Values.cloudnativePG.walStorage.size | quote }} size: {{ .Values.cloudnativePG.walStorage.size | quote }}
+51
View File
@@ -45,6 +45,10 @@ tests:
path: spec.storage.storageClass path: spec.storage.storageClass
- notExists: - notExists:
path: spec.walStorage path: spec.walStorage
- notExists:
path: spec.affinity
- notExists:
path: spec.topologySpreadConstraints
- it: "Render the credential Secret with the default values" - it: "Render the credential Secret with the default values"
template: templates/secret_cloudnativePG.yaml template: templates/secret_cloudnativePG.yaml
@@ -129,3 +133,50 @@ tests:
value: value:
size: "42Mi" size: "42Mi"
storageClass: "my-wal-storage-class" storageClass: "my-wal-storage-class"
- it: "Apply the scheduling customizations"
template: templates/cluster.yaml
set:
cloudnativePG:
enabled: true
affinity:
nodeSelector:
disktype: ssd
podAntiAffinityType: required
tolerations:
- key: my-key
operator: Equal
value: my-value
effect: NoSchedule
priorityClassName: my-priority-class
topologySpreadConstraints:
- maxSkew: 1
topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: DoNotSchedule
labelSelector:
matchLabels:
app.kubernetes.io/name: gitea
asserts:
- equal:
path: spec.affinity
value:
nodeSelector:
disktype: ssd
podAntiAffinityType: required
tolerations:
- key: my-key
operator: Equal
value: my-value
effect: NoSchedule
- equal:
path: spec.priorityClassName
value: my-priority-class
- equal:
path: spec.topologySpreadConstraints
value:
- maxSkew: 1
topologyKey: topology.kubernetes.io/zone
whenUnsatisfiable: DoNotSchedule
labelSelector:
matchLabels:
app.kubernetes.io/name: gitea
+8 -5
View File
@@ -1178,19 +1178,22 @@ cloudnativePG:
size: 2Gi size: 2Gi
storageClass: "" storageClass: ""
## @param cloudnativePG.monitoring.enablePodMonitor Create a `PodMonitor` for the CloudNativePG `Cluster`. ## @param cloudnativePG.affinity Affinity for the PostgreSQL pods. CloudNativePG nests `nodeSelector` and `tolerations` below this key as well.
monitoring:
enablePodMonitor: false
## @param cloudnativePG.affinity Affinity for the PostgreSQL pods.
affinity: {} affinity: {}
## @param cloudnativePG.priorityClassName Priority class name for the PostgreSQL pods. ## @param cloudnativePG.priorityClassName Priority class name for the PostgreSQL pods.
priorityClassName: "" priorityClassName: ""
## @param cloudnativePG.monitoring.enablePodMonitor Create a `PodMonitor` for the CloudNativePG `Cluster`.
monitoring:
enablePodMonitor: false
## @param cloudnativePG.resources Kubernetes resources for the PostgreSQL containers. ## @param cloudnativePG.resources Kubernetes resources for the PostgreSQL containers.
resources: {} resources: {}
## @param cloudnativePG.topologySpreadConstraints Topology spread constraints for the PostgreSQL pods.
topologySpreadConstraints: []
## @section valkey ## @section valkey
valkey: valkey: