Changed defaults. Explicitly setting poolMode and type

Signed-off-by: Itay Grudev <[email protected]>
cloudnative-pg · Oct 15, 2024 · 0fb3512 · 0fb3512
1 parent ab02f03
commit 0fb3512
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/charts/cluster/templates/pooler.yaml b/charts/cluster/templates/pooler.yaml
@@ -8,25 +8,27 @@ spec:
   cluster:
     name: {{ include "cluster.fullname" $ }}
   instances: {{ .instances }}
-  type: {{ .type }}
+  type: {{ default "rw" .type }}
   pgbouncer:
-    poolMode: {{ .poolMode }}
+    poolMode: {{ default "session" .poolMode }}
+    {{- with .parameters }}
     parameters:
-      {{- toYaml .parameters | nindent 6 }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
+  {{ with .monitoring }}
   monitoring:
+  {{- if not (empty .monitoring.podMonitor) }}
     enablePodMonitor: {{ and .monitoring.enabled .monitoring.podMonitor.enabled }}
-    {{- if not (empty .monitoring.podMonitor.relabelings) }}
     {{- with .monitoring.podMonitor.relabelings }}
     podMonitorRelabelings:
       {{- toYaml . | nindent 6 }}
     {{ end }}
-    {{- end }}
-    {{- if not (empty .monitoring.podMonitor.metricRelabelings) }}
     {{- with .monitoring.podMonitor.metricRelabelings }}
     podMonitorMetricRelabelings:
       {{- toYaml . | nindent 6 }}
     {{ end }}
-    {{- end }}
+  {{- end }}
+  {{- end }}
   {{- with .template }}
   template:
     {{- . | toYaml | nindent 4 }}

diff --git a/charts/cluster/test/pooler/01-pooler_cluster-assert.yaml b/charts/cluster/test/pooler/01-pooler_cluster-assert.yaml
@@ -21,7 +21,7 @@ spec:
     name: pooler-cluster
   instances: 2
   pgbouncer:
-    poolMode: transaction
+    poolMode: session
   type: rw
 ---
 apiVersion: postgresql.cnpg.io/v1
@@ -33,5 +33,5 @@ spec:
     name: pooler-cluster
   instances: 2
   pgbouncer:
-    poolMode: transaction
+    poolMode: session
   type: ro