From bc10ac06d8b78db99deeb37b87352b9cee976984 Mon Sep 17 00:00:00 2001
From: bitnami-bot <containers-bot@bitnami.com>
Date: Fri, 16 Aug 2019 10:11:22 +0000
Subject: [PATCH] Synchronize upstreamed folder to d8c4f7996

---
 upstreamed/rabbitmq/Chart.yaml                 | 2 +-
 upstreamed/rabbitmq/README.md                  | 2 +-
 upstreamed/rabbitmq/templates/statefulset.yaml | 2 +-
 upstreamed/rabbitmq/templates/svc.yaml         | 4 ++--
 upstreamed/rabbitmq/values-production.yaml     | 2 +-
 upstreamed/rabbitmq/values.yaml                | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml
index e65d606f4a..bd6ef4a630 100644
--- a/upstreamed/rabbitmq/Chart.yaml
+++ b/upstreamed/rabbitmq/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: rabbitmq
-version: 6.3.0
+version: 6.3.1
 appVersion: 3.7.17
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md
index 6dcce2a30d..8821fb861d 100644
--- a/upstreamed/rabbitmq/README.md
+++ b/upstreamed/rabbitmq/README.md
@@ -130,7 +130,7 @@ The following table lists the configurable parameters of the RabbitMQ chart and
 | `metrics.serviceMonitor.relabellings`| Specify Metric Relabellings to add to the scrape endpoint                      | `nil`                     |
 | `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels.      | `false`                   |
 | `metrics.serviceMonitor.additionalLabels`| Used to pass Labels that are required by the Installed Prometheus Operator | `{}`                      |
-| `metrics.port`                       | Prometheus metrics exporter port                 | `9090`                                                  |
+| `metrics.port`                       | Prometheus metrics exporter port                 | `9419`                                                  |
 | `metrics.env`                        | Exporter [configuration environment variables](https://github.com/kbudde/rabbitmq_exporter#configuration) | `{}` |
 | `metrics.resources`                  | Exporter resource requests/limit                 | `nil`                                                   |
 | `metrics.capabilities`               | Exporter: Comma-separated list of extended [scraping capabilities supported by the target RabbitMQ server](https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities) | `bert,no_sort` |
diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml
index b95a589367..d6d5a7c018 100644
--- a/upstreamed/rabbitmq/templates/statefulset.yaml
+++ b/upstreamed/rabbitmq/templates/statefulset.yaml
@@ -256,7 +256,7 @@ spec:
         {{- end }}
         ports:
         - name: metrics
-          containerPort: {{ .Values.metrics.port }}
+          containerPort: 9090
         livenessProbe:
           httpGet:
             path: /metrics
diff --git a/upstreamed/rabbitmq/templates/svc.yaml b/upstreamed/rabbitmq/templates/svc.yaml
index b03e1ec10b..d2505f4c1e 100644
--- a/upstreamed/rabbitmq/templates/svc.yaml
+++ b/upstreamed/rabbitmq/templates/svc.yaml
@@ -42,8 +42,8 @@ spec:
     targetPort: stats
 {{- if .Values.metrics.enabled }}
   - name: metrics
-    port: 9090
-    targetPort: metrics
+    port: {{ .Values.metrics.port }}
+    targetPort: 9090
 {{- end }}
   selector:
     app: {{ template "rabbitmq.name" . }}
diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml
index 7f49cdafa4..48f73f00cb 100644
--- a/upstreamed/rabbitmq/values-production.yaml
+++ b/upstreamed/rabbitmq/values-production.yaml
@@ -312,7 +312,7 @@ metrics:
   ## ref: https://github.com/kbudde/rabbitmq_exporter#configuration
   env: {}
   ## Metrics exporter port
-  port: 9090
+  port: 9419
   ## Comma-separated list of extended scraping capabilities supported by the target RabbitMQ server
   ## ref: https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities
   capabilities: "bert,no_sort"
diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml
index e6e52c9523..a82f761e26 100644
--- a/upstreamed/rabbitmq/values.yaml
+++ b/upstreamed/rabbitmq/values.yaml
@@ -308,7 +308,7 @@ metrics:
   ## ref: https://github.com/kbudde/rabbitmq_exporter#configuration
   env: {}
   ## Metrics exporter port
-  port: 9090
+  port: 9419
   ## Comma-separated list of extended scraping capabilities supported by the target RabbitMQ server
   ## ref: https://github.com/kbudde/rabbitmq_exporter#extended-rabbitmq-capabilities
   capabilities: "bert,no_sort"