fix sentinel timeout

dell · Jun 4, 2024 · 8717b2a · 8717b2a
1 parent 94b569f
commit 8717b2a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/operatorconfig/moduleconfig/authorization/v2.0.0-alpha/deployment.yaml b/operatorconfig/moduleconfig/authorization/v2.0.0-alpha/deployment.yaml
@@ -694,9 +694,9 @@ spec:
             done            
             loop=$(echo $nodes | sed -e "s/"*"/\n/g")
 
-            foundMaster=$false
+            foundMaster=false
 
-            while [ $foundMaster == $false ] 
+            while [ "$foundMaster" == "false" ] 
             do  
               for i in $loop
               do
@@ -705,27 +705,27 @@ spec:
                   if [ "$ROLE" = "master" ]; then
                       MASTER=$i.authorization.svc.cluster.local
                       echo "Master found at $MASTER..."
-                      foundMaster=$true
+                      foundMaster=true
                       break
                   else
                     MASTER=$(redis-cli --no-auth-warning --raw -h $i -a $REDIS_PASSWORD info replication | awk '{print $1}' | grep master_host: | cut -d ":" -f2)
                     if [ "$MASTER" = "" ]; then
                         echo "Master not found..."
-                        echo "Sleeping 5 seconds for redis pods to come up..."
+                        echo "Waiting 5 seconds for redis pods to come up..."
                         sleep 5
                         MASTER=
                     else
                         echo "Master found at $MASTER..."
-                        foundMaster=$true
+                        foundMaster=true
                         break
                     fi
                   fi
               done
 
-              if [ $foundMaster == $true ]; then
+              if [ "$foundMaster" == "true" ]; then
                 break
               else   
-                 echo "Master not found, sleep for 30s before attempting again"
+                 echo "Master not found, wait for 30s before attempting again"
                  sleep 30
               fi
             done

diff --git a/pkg/modules/testdata/cr_auth_proxy.yaml b/pkg/modules/testdata/cr_auth_proxy.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:6.0.8-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/pkg/modules/testdata/cr_auth_proxy_bad_vault_cert.yaml b/pkg/modules/testdata/cr_auth_proxy_bad_vault_cert.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:6.0.8-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/pkg/modules/testdata/cr_auth_proxy_bad_vault_key.yaml b/pkg/modules/testdata/cr_auth_proxy_bad_vault_key.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:6.0.8-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml b/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:7.2.4-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/pkg/modules/testdata/cr_auth_proxy_openshift.yaml b/pkg/modules/testdata/cr_auth_proxy_openshift.yaml
@@ -79,7 +79,7 @@ spec:
           redis: redis:6.0.8-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/pkg/modules/testdata/cr_auth_proxy_vault_cert.yaml b/pkg/modules/testdata/cr_auth_proxy_vault_cert.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:6.0.8-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis

diff --git a/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml b/samples/authorization/csm_authorization_proxy_server_v200-alpha.yaml
@@ -85,7 +85,7 @@ spec:
           redis: redis:7.2.4-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
 

diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml
@@ -78,7 +78,7 @@ spec:
           redis: redis:7.2.4-alpine
           commander: rediscommander/redis-commander:latest
           redisName: redis-csm
-          redisCommander: redicommander
+          redisCommander: rediscommander
           sentinel: sentinel
           redisReplicas: 5
           # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis