From a0eaa5fe0137dc5fb0c69cfd3366ca704075ff75 Mon Sep 17 00:00:00 2001
From: Michael Hudgins <30155094+MichaelHudgins@users.noreply.github.com>
Date: Fri, 5 Mar 2021 06:25:54 -0500
Subject: [PATCH] [bitnami/redis] Service port rename for istio protocol
 selection (#5679)

* Service names changed for istio protocol selection

* [bitnami/redis] Update components versions

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

Co-authored-by: Bitnami Containers <containers@bitnami.com>
---
 bitnami/redis/Chart.yaml                             | 2 +-
 bitnami/redis/templates/headless-svc.yaml            | 4 ++--
 bitnami/redis/templates/redis-master-svc.yaml        | 2 +-
 bitnami/redis/templates/redis-slave-svc.yaml         | 2 +-
 bitnami/redis/templates/redis-with-sentinel-svc.yaml | 4 ++--
 bitnami/redis/values.yaml                            | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bitnami/redis/Chart.yaml b/bitnami/redis/Chart.yaml
index c398d3c07..9942a42d9 100644
--- a/bitnami/redis/Chart.yaml
+++ b/bitnami/redis/Chart.yaml
@@ -25,4 +25,4 @@ name: redis
 sources:
   - https://github.com/bitnami/bitnami-docker-redis
   - http://redis.io/
-version: 12.8.2
+version: 12.8.3
diff --git a/bitnami/redis/templates/headless-svc.yaml b/bitnami/redis/templates/headless-svc.yaml
index 199156392..d758c0d23 100644
--- a/bitnami/redis/templates/headless-svc.yaml
+++ b/bitnami/redis/templates/headless-svc.yaml
@@ -15,11 +15,11 @@ spec:
   publishNotReadyAddresses: true
   {{- end }}
   ports:
-    - name: redis
+    - name: tcp-redis
       port: {{ .Values.redisPort }}
       targetPort: redis
   {{- if .Values.sentinel.enabled }}
-    - name: redis-sentinel
+    - name: tcp-sentinel
       port: {{ .Values.sentinel.port }}
       targetPort: redis-sentinel
   {{- end }}
diff --git a/bitnami/redis/templates/redis-master-svc.yaml b/bitnami/redis/templates/redis-master-svc.yaml
index 2587f226a..8bd2f8c1c 100644
--- a/bitnami/redis/templates/redis-master-svc.yaml
+++ b/bitnami/redis/templates/redis-master-svc.yaml
@@ -30,7 +30,7 @@ spec:
 {{- end }}
   {{- end }}
   ports:
-    - name: redis
+    - name: tcp-redis
       port: {{ .Values.master.service.port }}
       targetPort: redis
       {{- if .Values.master.service.nodePort }}
diff --git a/bitnami/redis/templates/redis-slave-svc.yaml b/bitnami/redis/templates/redis-slave-svc.yaml
index ef84428db..a67ebb05e 100644
--- a/bitnami/redis/templates/redis-slave-svc.yaml
+++ b/bitnami/redis/templates/redis-slave-svc.yaml
@@ -30,7 +30,7 @@ spec:
     {{- end }}
   {{- end }}
   ports:
-    - name: redis
+    - name: tcp-redis
       port: {{ .Values.slave.service.port }}
       targetPort: redis
       {{- if .Values.slave.service.nodePort }}
diff --git a/bitnami/redis/templates/redis-with-sentinel-svc.yaml b/bitnami/redis/templates/redis-with-sentinel-svc.yaml
index b49aa53da..e1c9073a4 100644
--- a/bitnami/redis/templates/redis-with-sentinel-svc.yaml
+++ b/bitnami/redis/templates/redis-with-sentinel-svc.yaml
@@ -25,13 +25,13 @@ spec:
   {{ end -}}
   {{- end -}}
   ports:
-    - name: redis
+    - name: tcp-redis
       port: {{ .Values.sentinel.service.redisPort }}
       targetPort: redis
       {{- if .Values.sentinel.service.redisNodePort }}
       nodePort: {{ .Values.sentinel.service.redisNodePort }}
       {{- end }}
-    - name: redis-sentinel
+    - name: tcp-sentinel
       port: {{ .Values.sentinel.service.sentinelPort }}
       targetPort: redis-sentinel
       {{- if .Values.sentinel.service.sentinelNodePort }}
diff --git a/bitnami/redis/values.yaml b/bitnami/redis/values.yaml
index 5b90d065a..58b25eb22 100644
--- a/bitnami/redis/values.yaml
+++ b/bitnami/redis/values.yaml
@@ -18,7 +18,7 @@ image:
   ## Bitnami Redis(TM) image tag
   ## ref: https://github.com/bitnami/bitnami-docker-redis#supported-tags-and-respective-dockerfile-links
   ##
-  tag: 6.0.12-debian-10-r0
+  tag: 6.0.12-debian-10-r3
   ## Specify a imagePullPolicy
   ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
   ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -728,7 +728,7 @@ metrics:
   image:
     registry: docker.io
     repository: bitnami/redis-exporter
-    tag: 1.17.1-debian-10-r9
+    tag: 1.17.1-debian-10-r12
     pullPolicy: IfNotPresent
     ## Optionally specify an array of imagePullSecrets.
     ## Secrets must be manually created in the namespace.