From 2163f422f00c874d2bec2b9fb0257f2c1a1218df Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 4 May 2026 11:38:44 +0500 Subject: [PATCH 1/3] fix: monitored images metricCollector --- operator/charts/patroni-services/templates/_helpers.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operator/charts/patroni-services/templates/_helpers.tpl b/operator/charts/patroni-services/templates/_helpers.tpl index e4ef5abd..cb320624 100644 --- a/operator/charts/patroni-services/templates/_helpers.tpl +++ b/operator/charts/patroni-services/templates/_helpers.tpl @@ -378,8 +378,8 @@ Return namespace for gateway {{- define "supplementary-tests.monitoredImages" -}} {{- printf "deployment postgres-operator patroni-services %s, " (include "find_image" (dict "deployName" "postgres_operator" "SERVICE_NAME" "patroni-services" "vals" .Values "default" .Values.operator.image)) -}} - {{- if (eq (include "monitoring.install" .) "true") -}} - {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.monitoring.dockerImage)) -}} + {{- if .Values.metricCollector.install -}} + {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.metricCollector.dockerImage)) -}} {{- end -}} {{- if .Values.backupDaemon.install -}} From fd2096ac14c00678673256733431310556bafc17 Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 4 May 2026 15:22:20 +0500 Subject: [PATCH 2/3] fix: revert condition --- operator/charts/patroni-services/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator/charts/patroni-services/templates/_helpers.tpl b/operator/charts/patroni-services/templates/_helpers.tpl index cb320624..e4d4a32f 100644 --- a/operator/charts/patroni-services/templates/_helpers.tpl +++ b/operator/charts/patroni-services/templates/_helpers.tpl @@ -378,9 +378,9 @@ Return namespace for gateway {{- define "supplementary-tests.monitoredImages" -}} {{- printf "deployment postgres-operator patroni-services %s, " (include "find_image" (dict "deployName" "postgres_operator" "SERVICE_NAME" "patroni-services" "vals" .Values "default" .Values.operator.image)) -}} - {{- if .Values.metricCollector.install -}} - {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.metricCollector.dockerImage)) -}} - {{- end -}} +{{- if (eq (include "monitoring.install" .) "true") -}} + {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.metricCollector.dockerImage)) -}} +{{- end -}} {{- if .Values.backupDaemon.install -}} {{- printf "deployment postgres-backup-daemon postgres-backup-daemon %s, " (include "find_image" (dict "deployName" "postgres_backup_daemon" "SERVICE_NAME" "postgres_backup_daemon" "vals" .Values "default" .Values.backupDaemon.dockerImage)) -}} From 887da5a5464bd6e6ebede3358fdd28a604f52046 Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 4 May 2026 15:25:21 +0500 Subject: [PATCH 3/3] fix --- operator/charts/patroni-services/templates/_helpers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/operator/charts/patroni-services/templates/_helpers.tpl b/operator/charts/patroni-services/templates/_helpers.tpl index e4d4a32f..0f56456b 100644 --- a/operator/charts/patroni-services/templates/_helpers.tpl +++ b/operator/charts/patroni-services/templates/_helpers.tpl @@ -378,9 +378,9 @@ Return namespace for gateway {{- define "supplementary-tests.monitoredImages" -}} {{- printf "deployment postgres-operator patroni-services %s, " (include "find_image" (dict "deployName" "postgres_operator" "SERVICE_NAME" "patroni-services" "vals" .Values "default" .Values.operator.image)) -}} -{{- if (eq (include "monitoring.install" .) "true") -}} - {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.metricCollector.dockerImage)) -}} -{{- end -}} + {{- if (eq (include "monitoring.install" .) "true") -}} + {{- printf "deployment monitoring-collector monitoring-collector %s, " (include "find_image" (dict "deployName" "pg_patroni_metric_collector" "SERVICE_NAME" "pg_patroni_metric_collector" "vals" .Values "default" .Values.metricCollector.dockerImage)) -}} + {{- end -}} {{- if .Values.backupDaemon.install -}} {{- printf "deployment postgres-backup-daemon postgres-backup-daemon %s, " (include "find_image" (dict "deployName" "postgres_backup_daemon" "SERVICE_NAME" "postgres_backup_daemon" "vals" .Values "default" .Values.backupDaemon.dockerImage)) -}}