From d2e0ce75ac0880ed7e49d3600a65908f54c0d491 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Mon, 6 Jun 2016 20:10:39 +0530
Subject: [PATCH] memcached: upgrade to bitnami/memcached:1.4.25-r0 (#42)

---
 memcached/Chart.yaml                  | 2 +-
 memcached/manifests/memcached-rc.yaml | 8 +++++---
 memcached/tpl/memcached-rc.yaml       | 8 +++++---
 memcached/tpl/values.toml             | 1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/memcached/Chart.yaml b/memcached/Chart.yaml
index d7334e483..bfa12e883 100644
--- a/memcached/Chart.yaml
+++ b/memcached/Chart.yaml
@@ -2,7 +2,7 @@ name: memcached
 home: http://memcached.org/
 source:
 - https://github.com/bitnami/bitnami-docker-memcached
-version: 0.1.0
+version: 0.2.0
 description: Chart for Memcached
 maintainers:
 - Bitnami <containers@bitnami.com>
diff --git a/memcached/manifests/memcached-rc.yaml b/memcached/manifests/memcached-rc.yaml
index 930695466..421dd4195 100644
--- a/memcached/manifests/memcached-rc.yaml
+++ b/memcached/manifests/memcached-rc.yaml
@@ -10,18 +10,20 @@ spec:
   replicas: 1
   selector:
     provider: memcached
-    version: 1.4.25-1
+    version: 1.4.25-r0
   template:
     metadata:
       labels:
         provider: memcached
-        version: 1.4.25-1
+        version: 1.4.25-r0
         heritage: bitnami
     spec:
       containers:
       - name: memcached
-        image: bitnami/memcached:1.4.25-1
+        image: bitnami/memcached:1.4.25-r0
         env:
+        - name: MEMCACHED_USER
+          value: ""
         - name: MEMCACHED_PASSWORD
           value: ""
         ports:
diff --git a/memcached/tpl/memcached-rc.yaml b/memcached/tpl/memcached-rc.yaml
index 19a8660b8..5c7397076 100644
--- a/memcached/tpl/memcached-rc.yaml
+++ b/memcached/tpl/memcached-rc.yaml
@@ -10,18 +10,20 @@ spec:
   replicas: 1
   selector:
     provider: memcached
-    version: 1.4.25-1
+    version: 1.4.25-r0
   template:
     metadata:
       labels:
         provider: memcached
-        version: 1.4.25-1
+        version: 1.4.25-r0
         heritage: bitnami
     spec:
       containers:
       - name: memcached
-        image: bitnami/memcached:1.4.25-1
+        image: bitnami/memcached:1.4.25-r0
         env:
+        - name: MEMCACHED_USER
+          value: {{ .memcachedUser | quote }}
         - name: MEMCACHED_PASSWORD
           value: {{ .memcachedPassword | quote }}
         ports:
diff --git a/memcached/tpl/values.toml b/memcached/tpl/values.toml
index 5473e5d72..505f7c993 100644
--- a/memcached/tpl/values.toml
+++ b/memcached/tpl/values.toml
@@ -1 +1,2 @@
+memcachedUser = ""
 memcachedPassword = ""