From c60c138777edc0cc35ccb7fcd8a13b57093a7ee1 Mon Sep 17 00:00:00 2001
From: Huy Tran <ht095u@att.com>
Date: Tue, 6 Apr 2021 19:18:20 -0500
Subject: [PATCH] Enhancements to make stats cachedump configurable

Memcached stats cachedump is enabled by default. Changes in this
pathset provide an option to configure stats cachedump as desired
during deployment i.e. the stats cachedump can be disabled to
prevent user obtaining sensitive info via the cachedump data.

Change-Id: Ic6254f89b1478a414ac275436ddd659b16b75f98
---
 memcached/Chart.yaml                      | 2 +-
 memcached/templates/bin/_memcached.sh.tpl | 3 +++
 memcached/values.yaml                     | 2 ++
 releasenotes/notes/memcached.yaml         | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/memcached/Chart.yaml b/memcached/Chart.yaml
index 8b7a3b0c5f..42c81ba83c 100644
--- a/memcached/Chart.yaml
+++ b/memcached/Chart.yaml
@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.5.5
 description: OpenStack-Helm Memcached
 name: memcached
-version: 0.1.1
+version: 0.1.2
 home: https://github.com/memcached/memcached
 ...
diff --git a/memcached/templates/bin/_memcached.sh.tpl b/memcached/templates/bin/_memcached.sh.tpl
index d1018ca64d..c727c286db 100644
--- a/memcached/templates/bin/_memcached.sh.tpl
+++ b/memcached/templates/bin/_memcached.sh.tpl
@@ -20,5 +20,8 @@ memcached --version
 exec memcached -v \
   -p ${MEMCACHED_PORT} \
   -U 0 \
+{{- if not .Values.conf.memcached.stats_cachedump.enabled }}
+  -X \
+{{- end }}
   -c ${MEMCACHED_MAX_CONNECTIONS} \
   -m ${MEMCACHED_MEMORY}
diff --git a/memcached/values.yaml b/memcached/values.yaml
index 116a989b72..f7bef57bbd 100644
--- a/memcached/values.yaml
+++ b/memcached/values.yaml
@@ -22,6 +22,8 @@ conf:
     # NOTE(pordirect): this should match the value in
     # `pod.resources.memcached.memory`
     memory: 1024
+    stats_cachedump:
+      enabled: true
 
 dependencies:
   dynamic:
diff --git a/releasenotes/notes/memcached.yaml b/releasenotes/notes/memcached.yaml
index 8497276d9c..bb21fd39e7 100644
--- a/releasenotes/notes/memcached.yaml
+++ b/releasenotes/notes/memcached.yaml
@@ -2,4 +2,5 @@
 memcached:
   - 0.1.0 Initial Chart
   - 0.1.1 Change helm-toolkit dependency version to ">= 0.1.0"
+  - 0.1.2 Make stats cachedump configurable.
 ...