From e22547d91cd37356a21a533791aef141ea3c82ca Mon Sep 17 00:00:00 2001 From: Paul Farver Date: Thu, 19 Sep 2019 19:05:00 +0200 Subject: [PATCH] [stable/rabbitmq-ha] Move prometheus annotations to pods (#17247) * [stable/rabbitmq-ha] prometheus annotations on pod Signed-off-by: Paul Farver * [stable/rabbitmq-ha] Bump chart version Signed-off-by: Paul Farver * [stable/rabbitmq-ha] Removed usesless "or" Signed-off-by: Paul Farver --- stable/rabbitmq-ha/Chart.yaml | 2 +- stable/rabbitmq-ha/templates/service.yaml | 8 +------- stable/rabbitmq-ha/templates/statefulset.yaml | 4 ++++ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/stable/rabbitmq-ha/Chart.yaml b/stable/rabbitmq-ha/Chart.yaml index 51b37067d2..e54960e8cb 100644 --- a/stable/rabbitmq-ha/Chart.yaml +++ b/stable/rabbitmq-ha/Chart.yaml @@ -1,7 +1,7 @@ name: rabbitmq-ha apiVersion: v1 appVersion: 3.7.15 -version: 1.32.2 +version: 1.32.3 description: Highly available RabbitMQ cluster, the open source message broker software that implements the Advanced Message Queuing Protocol (AMQP). keywords: diff --git a/stable/rabbitmq-ha/templates/service.yaml b/stable/rabbitmq-ha/templates/service.yaml index b8738bed76..af8500db6b 100644 --- a/stable/rabbitmq-ha/templates/service.yaml +++ b/stable/rabbitmq-ha/templates/service.yaml @@ -1,15 +1,9 @@ apiVersion: v1 kind: Service metadata: -{{- if or .Values.service.annotations (and .Values.prometheus.exporter.enabled (not .Values.prometheus.operator.enabled)) }} - annotations: -{{- end }} {{- if .Values.service.annotations }} + annotations: {{ toYaml .Values.service.annotations | indent 4 }} -{{- end }} -{{- if and .Values.prometheus.exporter.enabled (not .Values.prometheus.operator.enabled) }} - prometheus.io/scrape: "true" - prometheus.io/port: {{ .Values.prometheus.exporter.port | quote }} {{- end }} name: {{ template "rabbitmq-ha.fullname" . }} namespace: {{ .Release.Namespace }} diff --git a/stable/rabbitmq-ha/templates/statefulset.yaml b/stable/rabbitmq-ha/templates/statefulset.yaml index 7ca2d2263a..286b5ca391 100644 --- a/stable/rabbitmq-ha/templates/statefulset.yaml +++ b/stable/rabbitmq-ha/templates/statefulset.yaml @@ -29,6 +29,10 @@ spec: {{- if not .Values.existingConfigMap }} checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- end }} + {{- if and .Values.prometheus.exporter.enabled (not .Values.prometheus.operator.enabled) }} + prometheus.io/scrape: "true" + prometheus.io/port: {{ .Values.prometheus.exporter.port | quote }} + {{- end }} {{- if .Values.podAnnotations }} {{ toYaml .Values.podAnnotations | indent 8 }} {{- end }}