Merge pull request #576 from mpihlak/fix-redis-liveness-probe

Fix command line for Redis liveness probe
spotahome · Apr 21, 2023 · 33b2339 · 33b2339
2 parents f027bb9 + 8e94166
commit 33b2339
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/example/operator/custom-startup-config.yaml b/example/operator/custom-startup-config.yaml
@@ -6,7 +6,7 @@ metadata:
 data:
   startup.sh: |
     #!/bin/bash
-    redis-cli -h 127.0.0.1 -p ${REDIS_PORT} ping --user pinger --pass pingpass --no-auth-warning
+    redis-cli -h 127.0.0.1 -p ${REDIS_PORT} --user pinger --pass pingpass --no-auth-warning ping | grep PONG
 ---
 apiVersion: databases.spotahome.com/v1
 kind: RedisFailover

diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go
@@ -383,7 +383,7 @@ func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[stri
 					Command: []string{
 						"sh",
 						"-c",
-						fmt.Sprintf("redis-cli -h $(hostname) -p %[1]v ping --user pinger --pass pingpass --no-auth-warning", rf.Spec.Redis.Port),
+						fmt.Sprintf("redis-cli -h $(hostname) -p %[1]v --user pinger --pass pingpass --no-auth-warning ping | grep PONG", rf.Spec.Redis.Port),
 					},
 				},
 			},

diff --git a/operator/redisfailover/service/generator_test.go b/operator/redisfailover/service/generator_test.go
@@ -1898,7 +1898,7 @@ func TestRedisCustomLivenessProbe(t *testing.T) {
 						Command: []string{
 							"sh",
 							"-c",
-							"redis-cli -h 127.0.0.1 -p ${REDIS_PORT} ping --user pinger --pass pingpass --no-auth-warning",
+							"redis-cli -h 127.0.0.1 -p ${REDIS_PORT} --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
 						},
 					},
 				},
@@ -1913,7 +1913,7 @@ func TestRedisCustomLivenessProbe(t *testing.T) {
 						Command: []string{
 							"sh",
 							"-c",
-							"redis-cli -h 127.0.0.1 -p ${REDIS_PORT} ping --user pinger --pass pingpass --no-auth-warning",
+							"redis-cli -h 127.0.0.1 -p ${REDIS_PORT} --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
 						},
 					},
 				},
@@ -1932,7 +1932,7 @@ func TestRedisCustomLivenessProbe(t *testing.T) {
 						Command: []string{
 							"sh",
 							"-c",
-							"redis-cli -h $(hostname) -p 6379 ping --user pinger --pass pingpass --no-auth-warning",
+							"redis-cli -h $(hostname) -p 6379 --user pinger --pass pingpass --no-auth-warning ping | grep PONG",
 						},
 					},
 				},