From dc24d654879619f0012ae0338e7166eff714e018 Mon Sep 17 00:00:00 2001
From: bhack <bhack@users.noreply.github.com>
Date: Thu, 3 May 2018 16:25:51 +0200
Subject: [PATCH] [stable/redis]Fix registryName (#5367)

* Fix image.registry

* Increase chart version

* remove defaults from image helpers
---
 stable/redis/Chart.yaml             |  2 +-
 stable/redis/templates/_helpers.tpl | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml
index 2238844d7f..f662ae19f0 100644
--- a/stable/redis/Chart.yaml
+++ b/stable/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 3.0.5
+version: 3.0.6
 appVersion: 4.0.9
 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.
 keywords:
diff --git a/stable/redis/templates/_helpers.tpl b/stable/redis/templates/_helpers.tpl
index c0df60e9bb..e5f2be1fbd 100644
--- a/stable/redis/templates/_helpers.tpl
+++ b/stable/redis/templates/_helpers.tpl
@@ -46,18 +46,20 @@ Return the appropriate apiVersion for networkpolicy.
 Return the proper image name
 */}}
 {{- define "redis.image" -}}
-{{- $registryName :=  default .Values.image.registry "docker.io" -}}
-{{- $tag := .Values.image.tag | default "latest" -}}
-{{- printf "%s/%s:%s" $registryName .Values.image.repository $tag -}}
+{{- $registryName :=  .Values.image.registry -}}
+{{- $repositoryName := .Values.image.repository -}}
+{{- $tag := .Values.image.tag -}}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
 
 {{/*
 Return the proper image name (for the metrics image)
 */}}
 {{- define "metrics.image" -}}
-{{- $registryName :=  default .Values.metrics.image.registry "docker.io" -}}
-{{- $tag := .Values.metrics.image.tag | default "latest" -}}
-{{- printf "%s/%s:%s" $registryName .Values.metrics.image.repository $tag -}}
+{{- $registryName :=  .Values.metrics.image.registry -}}
+{{- $repositoryName := .Values.metrics.image.repository -}}
+{{- $tag := .Values.metrics.image.tag -}}
+{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}}
 {{- end -}}
 
 {{/*