[bitnami/redis][bitnami/redis-cluster] Make probes MASTERDOWN aware and include timeout message (#8767)

* Make probes MASTERDOWN aware and include timeout message

Signed-off-by: eduardobr <eduardobr@gmail.com>

* Bump version on Chart.yaml

Signed-off-by: eduardobr <eduardobr@gmail.com>

bitnami/redis-cluster/Chart.yaml

@@ -23,4 +23,4 @@ name: redis-cluster
 sources:
   - https://github.com/bitnami/bitnami-docker-redis
   - http://redis.io/
-version: 7.1.3
+version: 7.2.0

bitnami/redis-cluster/templates/scripts-configmap.yaml

@@ -37,6 +37,10 @@ data:
 {{- end }}
         ping
     )
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
     if [ "$response" != "PONG" ]; then
       echo "$response"
       exit 1
@@ -58,6 +62,10 @@ data:
   {{- end }}
           CLUSTER INFO | grep cluster_state | tr -d '[:space:]'
       )
+      if [ $? == 124 ]; then
+        echo "Timed out"
+        exit 1
+      fi
       if [ "$response" != "cluster_state:ok" ]; then
         echo "$response"
         exit 1
@@ -88,7 +96,12 @@ data:
 {{- end }}
         ping
     )
-    if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
+    responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+    if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
       echo "$response"
       exit 1
     fi

bitnami/redis/Chart.yaml

@@ -24,4 +24,4 @@ maintainers:
 name: redis
 sources:
   - https://github.com/bitnami/bitnami-docker-redis
-version: 16.1.1
+version: 16.2.0

bitnami/redis/templates/health-configmap.yaml

@@ -33,6 +33,10 @@ data:
 {{- end }}
         ping
     )
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
     if [ "$response" != "PONG" ]; then
       echo "$response"
       exit 1
@@ -59,7 +63,12 @@ data:
 {{- end }}
         ping
     )
-    if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
+    responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+    if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ] && [ "$responseFirstWord" != "MASTERDOWN" ]; then
       echo "$response"
       exit 1
     fi
@@ -88,6 +97,10 @@ data:
 {{- end }}
         ping
     )
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
     if [ "$response" != "PONG" ]; then
       echo "$response"
       exit 1
@@ -128,6 +141,10 @@ data:
 {{- end }}
         ping
     )
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
     if [ "$response" != "PONG" ]; then
       echo "$response"
       exit 1
@@ -152,7 +169,12 @@ data:
 {{- end }}
         ping
     )
-    if [ "$response" != "PONG" ] && [ "$response" != "LOADING Redis is loading the dataset in memory" ]; then
+    if [ $? == 124 ]; then
+      echo "Timed out"
+      exit 1
+    fi
+    responseFirstWord=$(echo $response | head -n1 | awk '{print $1;}')
+    if [ "$response" != "PONG" ] && [ "$responseFirstWord" != "LOADING" ]; then
       echo "$response"
       exit 1
     fi