redis fix (#4331)

sourcegraph · May 27, 2024 · 97f205f · 97f205f
1 parent 331a5d5
commit 97f205f
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/base/redis/redis-cache.Deployment.yaml b/base/redis/redis-cache.Deployment.yaml
@@ -37,8 +37,22 @@ spec:
           name: redis
         readinessProbe:
           initialDelaySeconds: 5
-          tcpSocket:
-            port: redis
+          exec:
+            command:
+              - /bin/sh
+              - -c
+              - |
+                #!/bin/bash
+                if [ -f /etc/redis/redis.conf ]; then
+                  export REDISCLI_AUTH=$(grep -h "requirepass" /etc/redis/redis.conf | cut -d ' ' -f 2)
+                fi
+                response=$(
+                  redis-cli ping
+                )
+                if [ "$response" != "PONG" ]; then
+                  echo "$response"
+                  exit 1
+                fi
         resources:
           limits:
             cpu: "1"

diff --git a/base/redis/redis-store.Deployment.yaml b/base/redis/redis-store.Deployment.yaml
@@ -36,8 +36,22 @@ spec:
           name: redis
         readinessProbe:
           initialDelaySeconds: 5
-          tcpSocket:
-            port: redis
+          exec:
+            command:
+              - /bin/sh
+              - -c
+              - |
+                #!/bin/bash
+                if [ -f /etc/redis/redis.conf ]; then
+                  export REDISCLI_AUTH=$(grep -h "requirepass" /etc/redis/redis.conf | cut -d ' ' -f 2)
+                fi
+                response=$(
+                  redis-cli ping
+                )
+                if [ "$response" != "PONG" ]; then
+                  echo "$response"
+                  exit 1
+                fi
         resources:
           limits:
             cpu: "1"