From 85fe75bfcc1f4a6add364b9d5f31d010852f9a70 Mon Sep 17 00:00:00 2001 From: Wyatt Walter Date: Thu, 24 Aug 2023 02:38:51 -0500 Subject: [PATCH] [bitnami/rabbitmq] fix path to serviceMonitor annotations value (#18797) * fix path to serviceMonitor annotations value Signed-off-by: Wyatt Walter * bump version Signed-off-by: Wyatt Walter Signed-off-by: Wyatt Walter --------- Signed-off-by: Wyatt Walter Signed-off-by: Wyatt Walter --- bitnami/rabbitmq/Chart.yaml | 2 +- bitnami/rabbitmq/templates/servicemonitor.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bitnami/rabbitmq/Chart.yaml b/bitnami/rabbitmq/Chart.yaml index 93723f8b34..51db7bd38d 100644 --- a/bitnami/rabbitmq/Chart.yaml +++ b/bitnami/rabbitmq/Chart.yaml @@ -30,4 +30,4 @@ maintainers: name: rabbitmq sources: - https://github.com/bitnami/charts/tree/main/bitnami/rabbitmq -version: 12.1.0 +version: 12.1.1 diff --git a/bitnami/rabbitmq/templates/servicemonitor.yaml b/bitnami/rabbitmq/templates/servicemonitor.yaml index 92e46111a4..6bfc06d5dd 100644 --- a/bitnami/rabbitmq/templates/servicemonitor.yaml +++ b/bitnami/rabbitmq/templates/servicemonitor.yaml @@ -11,8 +11,8 @@ metadata: namespace: {{ default (include "common.names.namespace" .) .Values.metrics.serviceMonitor.namespace | quote }} {{- $labels := merge .Values.metrics.serviceMonitor.labels .Values.commonLabels }} labels: {{- include "common.labels.standard" ( dict "customLabels" $labels "context" $ ) | nindent 4 }} - {{- if or .Values.serviceMonitor.annotations .Values.commonAnnotations }} - {{- $annotations := merge .Values.serviceMonitor.annotations .Values.commonAnnotations }} + {{- if or .Values.metrics.serviceMonitor.annotations .Values.commonAnnotations }} + {{- $annotations := merge .Values.metrics.serviceMonitor.annotations .Values.commonAnnotations }} annotations: {{- include "common.tplvalues.render" ( dict "value" $annotations "context" $) | nindent 4 }} {{- end }} spec: