Merge "fix(secret): changes rmq-exporter secret src"

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
 ...

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

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