From 4cce138d314732df07826b07ab217584fdf573b2 Mon Sep 17 00:00:00 2001 From: kklinch0 Date: Wed, 5 Mar 2025 10:41:43 +0300 Subject: [PATCH] feature/add-topologyspreadconstraints-pg --- packages/apps/ferretdb/templates/postgres.yaml | 8 +++++++- packages/apps/postgres/Chart.yaml | 2 +- packages/apps/postgres/templates/db.yaml | 8 +++++++- packages/apps/versions_map | 3 ++- packages/extra/monitoring/templates/alerta/alerta-db.yaml | 7 +++++++ packages/extra/monitoring/templates/grafana/db.yaml | 8 +++++++- packages/system/keycloak/templates/db.yaml | 8 +++++++- 7 files changed, 38 insertions(+), 6 deletions(-) diff --git a/packages/apps/ferretdb/templates/postgres.yaml b/packages/apps/ferretdb/templates/postgres.yaml index 6ee92fd4..0bf48daf 100644 --- a/packages/apps/ferretdb/templates/postgres.yaml +++ b/packages/apps/ferretdb/templates/postgres.yaml @@ -6,7 +6,13 @@ metadata: spec: instances: {{ .Values.replicas }} enableSuperuserAccess: true - + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- if $configMap }} + {{- $rawConstraints := get $configMap.data "topologyConfig" }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 2 }} + {{- end }} + {{- end }} minSyncReplicas: {{ .Values.quorum.minSyncReplicas }} maxSyncReplicas: {{ .Values.quorum.maxSyncReplicas }} diff --git a/packages/apps/postgres/Chart.yaml b/packages/apps/postgres/Chart.yaml index 988feb50..ac0b4436 100644 --- a/packages/apps/postgres/Chart.yaml +++ b/packages/apps/postgres/Chart.yaml @@ -16,7 +16,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.8.0 +version: 0.9.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/packages/apps/postgres/templates/db.yaml b/packages/apps/postgres/templates/db.yaml index 22db426b..30e3e921 100644 --- a/packages/apps/postgres/templates/db.yaml +++ b/packages/apps/postgres/templates/db.yaml @@ -6,7 +6,13 @@ metadata: spec: instances: {{ .Values.replicas }} enableSuperuserAccess: true - + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- if $configMap }} + {{- $rawConstraints := get $configMap.data "topologyConfig" }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 2 }} + {{- end }} + {{- end }} postgresql: parameters: max_wal_senders: "30" diff --git a/packages/apps/versions_map b/packages/apps/versions_map index 87994a31..35746862 100644 --- a/packages/apps/versions_map +++ b/packages/apps/versions_map @@ -69,7 +69,8 @@ postgres 0.6.0 2a4768a postgres 0.6.2 54fd61c postgres 0.7.0 dc9d8bb postgres 0.7.1 175a65f -postgres 0.8.0 HEAD +postgres 0.8.0 cb7b8158 +postgres 0.9.0 HEAD rabbitmq 0.1.0 f642698 rabbitmq 0.2.0 5ca8823 rabbitmq 0.3.0 9e33dc0 diff --git a/packages/extra/monitoring/templates/alerta/alerta-db.yaml b/packages/extra/monitoring/templates/alerta/alerta-db.yaml index 397d554b..7d93259c 100644 --- a/packages/extra/monitoring/templates/alerta/alerta-db.yaml +++ b/packages/extra/monitoring/templates/alerta/alerta-db.yaml @@ -5,6 +5,13 @@ metadata: name: alerta-db spec: instances: 2 + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- if $configMap }} + {{- $rawConstraints := get $configMap.data "topologyConfig" }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 2 }} + {{- end }} + {{- end }} storage: size: {{ required ".Values.alerta.storage is required" .Values.alerta.storage }} {{- with .Values.alerta.storageClassName }} diff --git a/packages/extra/monitoring/templates/grafana/db.yaml b/packages/extra/monitoring/templates/grafana/db.yaml index 1e05a4f7..c22f2f70 100644 --- a/packages/extra/monitoring/templates/grafana/db.yaml +++ b/packages/extra/monitoring/templates/grafana/db.yaml @@ -6,7 +6,13 @@ spec: instances: 2 storage: size: {{ .Values.grafana.db.size }} - + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- if $configMap }} + {{- $rawConstraints := get $configMap.data "topologyConfig" }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 2 }} + {{- end }} + {{- end }} monitoring: enablePodMonitor: true diff --git a/packages/system/keycloak/templates/db.yaml b/packages/system/keycloak/templates/db.yaml index ad374bda..1782cd96 100644 --- a/packages/system/keycloak/templates/db.yaml +++ b/packages/system/keycloak/templates/db.yaml @@ -6,7 +6,13 @@ spec: instances: 2 storage: size: 20Gi - + {{- $configMap := lookup "v1" "ConfigMap" "cozy-system" "cozystack-scheduling" }} + {{- if $configMap }} + {{- $rawConstraints := get $configMap.data "topologyConfig" }} + {{- if $rawConstraints }} + {{- $rawConstraints | fromYaml | toYaml | nindent 2 }} + {{- end }} + {{- end }} monitoring: enablePodMonitor: true