From 4a77037d8eaf9858479a49dee3abcdeeea2e0c06 Mon Sep 17 00:00:00 2001
From: William Martin Stewart <zoidbergwill@gmail.com>
Date: Tue, 20 Jun 2017 12:15:36 +0200
Subject: [PATCH] Use memcached modern recommended options instead (#1221)

* Use memcached modern recommended options instead

* Allow setting custom Memcached options with a sane default

* Bump major version since this might break backwards compatibilty by changing defaults

* don't use '-o' if extendedOptions is empty

* Update Chart.yaml

* We set default for memcached verbosity to 'v' in values.yml

* fix options
---
 stable/memcached/Chart.yaml                 | 2 +-
 stable/memcached/templates/statefulset.yaml | 8 ++++++--
 stable/memcached/values.yaml                | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/stable/memcached/Chart.yaml b/stable/memcached/Chart.yaml
index f47c5a9e3a..eac84333e6 100644
--- a/stable/memcached/Chart.yaml
+++ b/stable/memcached/Chart.yaml
@@ -1,5 +1,5 @@
 name: memcached
-version: 1.0.1
+version: 1.1.0
 description: Free & open source, high-performance, distributed memory object caching system.
 keywords:
 - memcached
diff --git a/stable/memcached/templates/statefulset.yaml b/stable/memcached/templates/statefulset.yaml
index a99362c1ab..48bbf4c80b 100644
--- a/stable/memcached/templates/statefulset.yaml
+++ b/stable/memcached/templates/statefulset.yaml
@@ -37,7 +37,11 @@ spec:
         command:
         - memcached
         - -m {{ .Values.memcached.maxItemMemory  }}
-        {{- if default "" .Values.memcached.verbosity }}
+        {{- if .Values.memcached.extendedOptions }}
+        - -o
+        - {{ .Values.memcached.extendedOptions }}
+        {{- end }}
+        {{- if .Values.memcached.verbosity }}
         - -{{ .Values.memcached.verbosity }}
         {{- end }}
         ports:
@@ -54,4 +58,4 @@ spec:
           initialDelaySeconds: 5
           timeoutSeconds: 1
         resources:
-{{ toYaml .Values.resources | indent 10 }}
\ No newline at end of file
+{{ toYaml .Values.resources | indent 10 }}
diff --git a/stable/memcached/values.yaml b/stable/memcached/values.yaml
index d5fbd25ab7..91912a9ed7 100644
--- a/stable/memcached/values.yaml
+++ b/stable/memcached/values.yaml
@@ -19,6 +19,7 @@ memcached:
   ##
   maxItemMemory: 64
   verbosity: v
+  extendedOptions: modern
 
 ## Configure resource requests and limits
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/