Merge pull request #588 from spotahome/zekena2/master

fix: sentinel readiness probe to fail when monitoring localhost
spotahome · Apr 20, 2023 · 432661f · 432661f
2 parents d1319bf + ccbdde3
commit 432661f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/redisoperator/Chart.yaml b/charts/redisoperator/Chart.yaml
@@ -4,7 +4,7 @@ appVersion: 1.2.4
 apiVersion: v1
 description: A Helm chart for the Spotahome Redis Operator
 name: redis-operator
-version: 3.2.7
+version: 3.2.8
 home: https://github.com/spotahome/redis-operator
 keywords:
   - "golang"

diff --git a/operator/redisfailover/service/generator.go b/operator/redisfailover/service/generator.go
@@ -567,7 +567,7 @@ func generateSentinelDeployment(rf *redisfailoverv1.RedisFailover, labels map[st
 					Command: []string{
 						"sh",
 						"-c",
-						"redis-cli -h $(hostname) -p 26379 ping",
+						"redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
 					},
 				},
 			},

diff --git a/operator/redisfailover/service/generator_test.go b/operator/redisfailover/service/generator_test.go
@@ -2158,7 +2158,7 @@ func TestSentinelCustomReadinessProbe(t *testing.T) {
 						Command: []string{
 							"sh",
 							"-c",
-							"redis-cli -h $(hostname) -p 26379 ping",
+							"redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
 						},
 					},
 				},
-Original file line number
+Diff line change
@@ Expand Up @@
     					Command: []string{
     						"sh",
     						"-c",
-    						"redis-cli -h $(hostname) -p 26379 ping",
+    						"redis-cli -h $(hostname) -p 26379 sentinel get-master-addr-by-name mymaster | head -n 1 | grep -vq '127.0.0.1'",
     					},
     				},
     			},
@@ Expand Down @@