From 48740ddcfbbc76cfde90c4f9aa670957a215b6a0 Mon Sep 17 00:00:00 2001
From: Adnan Abdulhussein <adnan@prydoni.us>
Date: Sun, 29 Jan 2017 13:27:25 -0800
Subject: [PATCH] update redis to 3.2.6 (#523)

---
 stable/redis/Chart.yaml             | 2 +-
 stable/redis/README.md              | 2 +-
 stable/redis/templates/NOTES.txt    | 2 +-
 stable/redis/templates/_helpers.tpl | 6 +++---
 stable/redis/values.yaml            | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/stable/redis/Chart.yaml b/stable/redis/Chart.yaml
index 6e3209d6100a..ae0f412960e2 100644
--- a/stable/redis/Chart.yaml
+++ b/stable/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 0.4.2
+version: 0.4.3
 description: Chart for Redis
 keywords:
 - redis
diff --git a/stable/redis/README.md b/stable/redis/README.md
index 8bee8ae477ed..eff119f0a808 100644
--- a/stable/redis/README.md
+++ b/stable/redis/README.md
@@ -46,7 +46,7 @@ The following tables lists the configurable parameters of the Redis chart and th
 | Parameter                  | Description                         | Default                                                   |
 | -------------------------- | ----------------------------------- | --------------------------------------------------------- |
 | `image`                    | Redis image                         | `bitnami/redis:{VERSION}`                                 |
-| `imagePullPolicy`          | Image pull policy                   | `Always` if `imageTag` is `latest`, else `IfNotPresent`   |
+| `imagePullPolicy`          | Image pull policy                   | `IfNotPresent`                                            |
 | `redisPassword`            | Redis password                      | Randomly generated                                        |
 | `persistence.enabled`      | Use a PVC to persist data           | `true`                                                    |
 | `persistence.storageClass` | Storage class of backing PVC        | `generic`                                                 |
diff --git a/stable/redis/templates/NOTES.txt b/stable/redis/templates/NOTES.txt
index 62f19c5e2234..26afe51b28f7 100644
--- a/stable/redis/templates/NOTES.txt
+++ b/stable/redis/templates/NOTES.txt
@@ -3,7 +3,7 @@ Redis can be accessed via port 3306 on the following DNS name from within your c
 
 To get your password run:
 
-    REDIS_PASSWORD=$(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.redis-password[*]}"`))
+    REDIS_PASSWORD=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.redis-password}" | base64 --decode)
 
 To connect to your Redis server:
 
diff --git a/stable/redis/templates/_helpers.tpl b/stable/redis/templates/_helpers.tpl
index 234480de714c..f0d83d2edba6 100644
--- a/stable/redis/templates/_helpers.tpl
+++ b/stable/redis/templates/_helpers.tpl
@@ -3,14 +3,14 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/stable/redis/values.yaml b/stable/redis/values.yaml
index 6cec223b1b15..d84f7f8f1139 100644
--- a/stable/redis/values.yaml
+++ b/stable/redis/values.yaml
@@ -1,13 +1,12 @@
 ## Bitnami Redis image version
 ## ref: https://hub.docker.com/r/bitnami/redis/tags/
 ##
-image: bitnami/redis:3.2.5-r0
+image: bitnami/redis:3.2.6-r2
 
 ## Specify a imagePullPolicy
-## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
 ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
 ##
-# imagePullPolicy:
+imagePullPolicy: IfNotPresent
 
 ## Redis password
 ## Defaults to a random 10-character alphanumeric string if not set