fix redis readiness to handle for no password

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

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/base/redis/redis-cache.Deployment.yaml b/base/redis/redis-cache.Deployment.yaml
@@ -36,15 +36,17 @@ spec:
         - containerPort: 6379
           name: redis
         readinessProbe:
-          initialDelaySeconds: 5
+          initialDelaySeconds: 10
+          timeoutSeconds: 5
           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)
+                PASS_CHECK=$(grep -h "requirepass" /etc/redis/redis.conf | cut -d ' ' -f 2)
+                if [ ! -z "$PASS_CHECK" ]; then
+                  export REDISCLI_AUTH="$PASS_CHECK"
                 fi
                 response=$(
                   redis-cli ping

diff --git a/base/redis/redis-store.Deployment.yaml b/base/redis/redis-store.Deployment.yaml
@@ -35,15 +35,17 @@ spec:
         - containerPort: 6379
           name: redis
         readinessProbe:
-          initialDelaySeconds: 5
+          initialDelaySeconds: 10
+          timeoutSeconds: 5
           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)
+                PASS_CHECK=$(grep -h "requirepass" /etc/redis/redis.conf | cut -d ' ' -f 2)
+                if [ ! -z "$PASS_CHECK" ]; then
+                  export REDISCLI_AUTH="$PASS_CHECK"
                 fi
                 response=$(
                   redis-cli ping