Address feedback

Author: yannick-roeder

charts/cnpg-database/templates/cluster.yaml

@@ -17,8 +17,6 @@ spec:
   imageName: "{{ .Values.postgres.image.repository }}:{{ .Values.postgres.image.tag }}"
   enablePDB: {{ .Values.postgres.enablePDB }}
   enableSuperuserAccess: {{ .Values.postgres.enableSuperuserAccess }}
-  monitoring:
-    enablePodMonitor: {{ .Values.postgres.enablePodMonitor }}
   {{- with .Values.postgres.resources }}
   resources:
     {{- toYaml . | nindent 4 }}

charts/cnpg-database/templates/pod-monitor.yaml

@@ -0,0 +1,13 @@
+{{- if .Values.podMonitor.enabled }}
+# yaml-language-server: $schema=https://raw.githubusercontent.com/datreeio/CRDs-catalog/refs/heads/main/monitoring.coreos.com/podmonitor_v1.json
+apiVersion: monitoring.coreos.com/v1
+kind: PodMonitor
+metadata:
+  name: {{ include "cnpg-database.fullname" . }}
+spec:
+  selector:
+    matchLabels:
+      cnpg.io/cluster: {{ include "cnpg-database.fullname" . }}
+  podMetricsEndpoints:
+    - port: metrics
+{{- end }}

charts/cnpg-database/templates/secret-s3.yaml

@@ -12,4 +12,8 @@ spec:
   encryptedData:
     S3_ACCESS_KEY: {{.Values.backup.s3.accessKey }}
     S3_SECRET_KEY: {{.Values.backup.s3.secretKey }}
+  template:
+    metadata:
+      annotations:
+        cnpg.io/reload: "true"
 {{- end }}

charts/cnpg-database/templates/secrets-users.yaml

@@ -13,7 +13,8 @@ spec:
     password: {{ .password | quote }}
   template:
     metadata:
-      name: {{ printf "%s-creds-%s" (include "cnpg-database.fullname" $) .username | replace "." "-" | trunc 63 | quote }}
+      annotations:
+        cnpg.io/reload: "true"
     type: kubernetes.io/basic-auth
     data:
       username: {{ .username | quote }}

charts/cnpg-database/values.yaml

@@ -9,7 +9,6 @@ postgres:
 
   enablePDB: true
   enableSuperuserAccess: true
-  enablePodMonitor: true
 
   resources:
     requests:
@@ -19,7 +18,7 @@ postgres:
       memory: "512Mi"
       cpu: "50m"
 
-  # Storage configuration, see https://cloudnative-pg.io/documentation/current/storage/
+  # Storage configuration, see https://cloudnative-pg.io/docs/current/storage/
   storage:
     class: standard
     data:
@@ -29,7 +28,7 @@ postgres:
       resizeInUseVolume: true
       size: 10Gi
 
-  # Bootstrap the PostgreSQL: https://cloudnative-pg.io/documentation/current/bootstrap/
+  # Bootstrap the PostgreSQL: https://cloudnative-pg.io/docs/current/bootstrap/
   bootstrap:
     database: db
     owner: user
@@ -38,7 +37,7 @@ postgres:
       # Name of the S3 backup to recover from. Uses S3 settings from backup section.
       name: ""
 
-  # Parameters passed to PostgreSQL: https://cloudnative-pg.io/documentation/current/postgresql_conf/
+  # Parameters passed to PostgreSQL: https://cloudnative-pg.io/docs/current/postgresql_conf/
   parameters: {}
 
   groups: []
@@ -89,6 +88,10 @@ backup:
     maxParallel: 8
     encryption: AES256
 
+# See https://cloudnative-pg.io/docs/current/monitoring/#monitoring-with-the-prometheus-operator
+podMonitor:
+  enabled: true
+
 # CNPG deploys services for the database by default. This is just here if you require an extra service.
 additionalService:
   enabled: false