Skip to content

fix: integration monitoring test #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anikin-aa merged 1 commit into from
Apr 29, 2026
Merged

fix: integration monitoring test #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 20 additions & 17 deletions operator/charts/patroni-services/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,23 +376,26 @@ Return namespace for gateway
{{- end -}}

{{- define "supplementary-tests.monitoredImages" -}}
{{- if .Values.deployDescriptor -}}
{{- printf "deployment postgres-operator patroni-services %s, " (include "find_image" (dict "deployName" "postgres_operator" "SERVICE_NAME" "patroni-services" "vals" .Values "default" "not_found")) -}}
{{- 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" "not_found")) -}}
{{- 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" "not_found")) -}}
{{- end -}}
{{- if .Values.dbaas.install -}}
{{- printf "deployment dbaas-postgres-adapter dbaas-postgres-adapter %s, " (include "find_image" (dict "deployName" "postgresql_dbaas_adapter" "SERVICE_NAME" "postgresql_dbaas_adapter" "vals" .Values "default" "not_found")) -}}
{{- end -}}
{{- if .Values.powaUI.install -}}
{{- printf "deployment powa-ui powa-ui %s, " (include "find_image" (dict "deployName" "powa_ui_docker" "SERVICE_NAME" "powa_ui_docker" "vals" .Values "default" "not_found")) -}}
{{- end -}}
{{- if .Values.connectionPooler.install -}}
{{- printf "deployment connection-puller connection-puller %s, " (include "find_image" (dict "deployName" "pgbouncer" "SERVICE_NAME" "pgbouncer" "vals" .Values "default" "not_found")) -}}
{{- end -}}
{{- 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)) -}}
{{- 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)) -}}
{{- end -}}

{{- if .Values.dbaas.install -}}
{{- printf "deployment dbaas-postgres-adapter dbaas-postgres-adapter %s, " (include "find_image" (dict "deployName" "postgresql_dbaas_adapter" "SERVICE_NAME" "postgresql_dbaas_adapter" "vals" .Values "default" .Values.dbaas.dockerImage)) -}}
{{- end -}}

{{- if .Values.powaUI.install -}}
{{- printf "deployment powa-ui powa-ui %s, " (include "find_image" (dict "deployName" "powa_ui_docker" "SERVICE_NAME" "powa_ui_docker" "vals" .Values "default" .Values.powaUI.dockerImage)) -}}
{{- end -}}

{{- if .Values.connectionPooler.install -}}
{{- printf "deployment connection-puller connection-puller %s, " (include "find_image" (dict "deployName" "pgbouncer" "SERVICE_NAME" "pgbouncer" "vals" .Values "default" .Values.connectionPooler.dockerImage)) -}}
{{- end -}}
{{- end -}}

Expand Down
2 changes: 1 addition & 1 deletion tests/robot/image_tests/image_tests.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ Compare Images From Resources

*** Test Cases ***
Test Hardcoded Images
[Tags] patroni basic check_pg_images
[Tags] patroni_basic backup_basic check_pg_images
Skip If '${MONITORED_IMAGES}' == '${None}' or '${MONITORED_IMAGES}' == '' There are no monitored images
Compare Images From Resources ${MONITORED_IMAGES}
Loading