From f91b42a25bc3b66cc53e1623cc79f2508ce6f262 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20=C3=81ngel=20Cabrera=20Mi=C3=B1agorri?=
 <macabrera@bitnami.com>
Date: Fri, 8 May 2020 16:39:16 +0200
Subject: [PATCH] [bitnami/zookeeper] Fix issue in ports (#2513)

* Bump version

* [bitnami/zookeeper] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Bitnami Containers <containers@bitnami.com>
---
 bitnami/zookeeper/Chart.yaml                    | 2 +-
 bitnami/zookeeper/templates/servicemonitor.yaml | 2 +-
 bitnami/zookeeper/values-production.yaml        | 2 +-
 bitnami/zookeeper/values.yaml                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml
index e668a0cbc5..55b8ca93a4 100644
--- a/bitnami/zookeeper/Chart.yaml
+++ b/bitnami/zookeeper/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: zookeeper
-version: 5.14.2
+version: 5.14.3
 appVersion: 3.6.1
 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications.
 keywords:
diff --git a/bitnami/zookeeper/templates/servicemonitor.yaml b/bitnami/zookeeper/templates/servicemonitor.yaml
index d21d579c7c..abae171224 100644
--- a/bitnami/zookeeper/templates/servicemonitor.yaml
+++ b/bitnami/zookeeper/templates/servicemonitor.yaml
@@ -18,7 +18,7 @@ spec:
     matchLabels: {{- include "zookeeper.matchLabels" . | nindent 6 }}
       app.kubernetes.io/component: zookeeper
   endpoints:
-    - port: metrics
+    - port: tcp-metrics
       path: "/metrics"
       {{- if .Values.metrics.serviceMonitor.interval }}
       interval: {{ .Values.metrics.serviceMonitor.interval }}
diff --git a/bitnami/zookeeper/values-production.yaml b/bitnami/zookeeper/values-production.yaml
index e3e79bb9c7..9e9d81843e 100644
--- a/bitnami/zookeeper/values-production.yaml
+++ b/bitnami/zookeeper/values-production.yaml
@@ -14,7 +14,7 @@
 image:
   registry: docker.io
   repository: bitnami/zookeeper
-  tag: 3.6.1-debian-10-r1
+  tag: 3.6.1-debian-10-r7
   
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
diff --git a/bitnami/zookeeper/values.yaml b/bitnami/zookeeper/values.yaml
index bed14820c7..79885d29f6 100644
--- a/bitnami/zookeeper/values.yaml
+++ b/bitnami/zookeeper/values.yaml
@@ -14,7 +14,7 @@
 image:
   registry: docker.io
   repository: bitnami/zookeeper
-  tag: 3.6.1-debian-10-r1
+  tag: 3.6.1-debian-10-r7
   
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'