From f001105aadd90b75afb510198a04c5d40c955952 Mon Sep 17 00:00:00 2001 From: Tin Lam Date: Thu, 19 Nov 2020 18:13:30 -0600 Subject: [PATCH] fix(secret): changes rmq-exporter secret src This patch set changes the source of the rabbitmq-exporter's admin user credential to leverage the existing secret rather than the values in the Values.yaml file. Change-Id: I1ad48ade3984e455d07be3a8b8ee3d9b25b449a2 Signed-off-by: Tin Lam --- rabbitmq/Chart.yaml | 2 +- .../monitoring/prometheus/exporter-deployment.yaml | 10 ++++++++-- rabbitmq/values.yaml | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/rabbitmq/Chart.yaml b/rabbitmq/Chart.yaml index e52c0ac50..3b073f602 100644 --- a/rabbitmq/Chart.yaml +++ b/rabbitmq/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v3.7.26 description: OpenStack-Helm RabbitMQ name: rabbitmq -version: 0.1.1 +version: 0.1.2 home: https://github.com/rabbitmq/rabbitmq-server ... diff --git a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml index 74f5c46ba..1b46be5ff 100644 --- a/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/rabbitmq/templates/monitoring/prometheus/exporter-deployment.yaml @@ -67,9 +67,15 @@ spec: - name: RABBIT_URL value: http://{{ tuple "oslo_messaging" "internal" . | include "helm-toolkit.endpoints.hostname_fqdn_endpoint_lookup" }}:15672 - name: RABBIT_USER - value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.username | quote }} + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }} + key: RABBITMQ_ADMIN_USERNAME - name: RABBIT_PASSWORD - value: {{ $envAll.Values.endpoints.oslo_messaging.auth.user.password | quote }} + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" $envAll.Release.Name "admin-user" | quote }} + key: RABBITMQ_ADMIN_PASSWORD - name: RABBIT_CAPABILITIES value: {{ include "helm-toolkit.utils.joinListWithComma" $envAll.Values.conf.prometheus_exporter.capabilities | quote }} - name: PUBLISH_PORT diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml index 5240da426..20130203f 100644 --- a/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml @@ -370,8 +370,8 @@ manifests: service_exporter: true network_policy_exporter: false network_policy: false - secret_erlang_cookie: true secret_admin_user: true + secret_erlang_cookie: true service_discovery: true service_ingress_management: true service: true