From 9be7e7163b650e719c6d8d4efffbbe3225b026e6 Mon Sep 17 00:00:00 2001
From: jeremyxu2010 <jeremyxu2010@gmail.com>
Date: Wed, 11 Sep 2019 01:28:54 +0800
Subject: [PATCH] Fix haproxy check redis master configuration (#16709)

Signed-off-by: Jeremy Xu <jeremyxu2010@gmail.com>
---
 stable/redis-ha/Chart.yaml  |  2 +-
 stable/redis-ha/README.md   | 14 ++++++++++++++
 stable/redis-ha/values.yaml |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/stable/redis-ha/Chart.yaml b/stable/redis-ha/Chart.yaml
index a8a694af2129..e4735e420b14 100644
--- a/stable/redis-ha/Chart.yaml
+++ b/stable/redis-ha/Chart.yaml
@@ -6,7 +6,7 @@ keywords:
 - redis
 - keyvalue
 - database
-version: 3.7.6
+version: 3.7.7
 appVersion: 5.0.5
 description: Highly available Kubernetes implementation of Redis
 icon: https://upload.wikimedia.org/wikipedia/en/thumb/6/6b/Redis_Logo.svg/1200px-Redis_Logo.svg.png
diff --git a/stable/redis-ha/README.md b/stable/redis-ha/README.md
index 4fa7ff81029d..fdc6391399be 100644
--- a/stable/redis-ha/README.md
+++ b/stable/redis-ha/README.md
@@ -142,6 +142,20 @@ For example `repl-timeout 60` would be added to the `redis.config` section of th
     repl-timeout: "60"
 ```
 
+Note:
+
+1. Some config options should be renamed by redis version，e.g.:
+
+   ```
+   # In redis 5.x，see https://raw.githubusercontent.com/antirez/redis/5.0/redis.conf
+   min-replicas-to-write: 1
+   min-replicas-max-lag: 5
+   
+   # In redis 4.x and redis 3.x，see https://raw.githubusercontent.com/antirez/redis/4.0/redis.conf and https://raw.githubusercontent.com/antirez/redis/3.0/redis.conf
+   min-slaves-to-write 1
+   min-slaves-max-lag 5
+   ```
+
 Sentinel options supported must be in the the `sentinel <option> <master-group-name> <value>` format. For example, `sentinel down-after-milliseconds 30000` would be added to the `sentinel.config` section of the `values.yaml` as:
 
 ```yml
diff --git a/stable/redis-ha/values.yaml b/stable/redis-ha/values.yaml
index 84bcdc98bc93..45363d608d7a 100644
--- a/stable/redis-ha/values.yaml
+++ b/stable/redis-ha/values.yaml
@@ -83,8 +83,8 @@ redis:
   config:
     ## Additional redis conf options can be added below
     ## For all available options see http://download.redis.io/redis-stable/redis.conf
-    min-slaves-to-write: 1
-    min-slaves-max-lag: 5   # Value in seconds
+    min-replicas-to-write: 1
+    min-replicas-max-lag: 5   # Value in seconds
     maxmemory: "0"       # Max memory to use for each redis instance. Default is unlimited.
     maxmemory-policy: "volatile-lru"  # Max memory policy to use for each redis instance. Default is volatile-lru.
     # Determines if scheduled RDB backups are created. Default is false.