From da1117e2572d1e8d0b8956094eae072e77bdbe55 Mon Sep 17 00:00:00 2001 From: Chris Wedgwood Date: Thu, 8 Oct 2020 19:03:39 +0000 Subject: [PATCH] [PostgreSQL] Use explicit entrypoint for prometheus exporter It appears having `args:` without `command:` causes some combinations of kubernetes & container runtimes to not work as expected. Change-Id: Id9d692632066de410ca5f13bbfe13d1899b93819 --- postgresql/Chart.yaml | 2 +- .../templates/monitoring/prometheus/exporter-deployment.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/postgresql/Chart.yaml b/postgresql/Chart.yaml index 7771f7403..7ecc91355 100644 --- a/postgresql/Chart.yaml +++ b/postgresql/Chart.yaml @@ -15,7 +15,7 @@ apiVersion: v1 appVersion: v9.6 description: OpenStack-Helm PostgreSQL name: postgresql -version: 0.1.2 +version: 0.1.3 home: https://www.postgresql.org sources: - https://github.com/postgres/postgres diff --git a/postgresql/templates/monitoring/prometheus/exporter-deployment.yaml b/postgresql/templates/monitoring/prometheus/exporter-deployment.yaml index 5b09b391e..87c84df6c 100644 --- a/postgresql/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/postgresql/templates/monitoring/prometheus/exporter-deployment.yaml @@ -48,7 +48,8 @@ spec: {{ tuple $envAll "prometheus_postgresql_exporter" | include "helm-toolkit.snippets.image" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.prometheus_postgresql_exporter | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ dict "envAll" $envAll "application" "prometheus_postgresql_exporter" "container" "postgresql_exporter" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }} - args: + command: + - "/postgres_exporter" - "--extend.query-path=/queries.yaml" ports: - name: metrics