Merge pull request #73 from bcgov/develop/km

GRAD2-2841 - Institute - Update Redis cluster and related IaC to be p…
bcgov · Jun 27, 2024 · 1a6f8ea · 1a6f8ea
2 parents 45e268a + c27cf37
commit 1a6f8ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/create-redis-cluster-DEV.yml b/.github/workflows/create-redis-cluster-DEV.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Create Cluster
         run: |
           echo "Retrieve redis password..."
-          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's/.*"REDIS_PASSWORD": "\(.*\)",/\1/p' | base64 --decode)
+          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's|.*"REDIS_PASSWORD": "\([^"]*\)".*|\1|p' | base64 --decode)
           echo "Creating Cluster..."
           oc exec -i redis-ha-0 -- redis-cli --cluster create --cluster-replicas 1 $(oc get pods -l app=redis-ha -o jsonpath='{range.items[*]}{.status.podIP}:6379 {end}') --cluster-yes -a $REDIS_PASSWORD
           echo "Success!"
diff --git a/.github/workflows/create-redis-cluster-PROD.yml b/.github/workflows/create-redis-cluster-PROD.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Create Cluster
         run: |
           echo "Retrieve redis password..."
-          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's/.*"REDIS_PASSWORD": "\(.*\)",/\1/p' | base64 --decode)
+          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's|.*"REDIS_PASSWORD": "\([^"]*\)".*|\1|p' | base64 --decode)
           echo "Creating Cluster..."
           oc exec -i redis-ha-0 -- redis-cli --cluster create --cluster-replicas 1 $(oc get pods -l app=redis-ha -o jsonpath='{range.items[*]}{.status.podIP}:6379 {end}') --cluster-yes -a $REDIS_PASSWORD
           echo "Success!"
diff --git a/.github/workflows/create-redis-cluster-TEST.yml b/.github/workflows/create-redis-cluster-TEST.yml
@@ -40,7 +40,7 @@ jobs:
       - name: Create Cluster
         run: |
           echo "Retrieve redis password..."
-          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's/.*"REDIS_PASSWORD": "\(.*\)",/\1/p' | base64 --decode)
+          REDIS_PASSWORD=$(oc -o json get secret redis-ha | sed -n 's|.*"REDIS_PASSWORD": "\([^"]*\)".*|\1|p' | base64 --decode)
           echo "Creating Cluster..."
           oc exec -i redis-ha-0 -- redis-cli --cluster create --cluster-replicas 1 $(oc get pods -l app=redis-ha -o jsonpath='{range.items[*]}{.status.podIP}:6379 {end}') --cluster-yes -a $REDIS_PASSWORD
           echo "Success!"