Quoted redis pass in values.yml

bcgov · Oct 18, 2024 · fa09ecc · fa09ecc
1 parent e87f8fb
commit fa09ecc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -170,7 +170,7 @@ jobs:
           DEPLOY_NAMESPACE: ${{ inputs.DEPLOY_NAMESPACE }}
           REDIS_NAME: ${{ inputs.REDIS_NAME }}
           REDIS_PASSWORD: ${{ secrets.REDIS_PASSWORD }}
-          REPLICAS: ${{ inputs.REDIS_REPLICAS }}
+          REDIS_REPLICAS: ${{ inputs.REDIS_REPLICAS }}
           OC_PROJECT: ${{ github.ref_name }}
 
       - name: Deploy Database StatefulSet (${{ inputs.DB_SERVICE  }})

diff --git a/openshift/scripts/deploy-redis-sentinel.sh b/openshift/scripts/deploy-redis-sentinel.sh
@@ -9,9 +9,9 @@ helm repo add bitnami https://charts.bitnami.com/bitnami
 cat <<EOF > values.yml
 global:
   redis:
-    password: $REDIS_PASSWORD
+    password: "$REDIS_PASSWORD"
 replica:
-  replicaCount: $REPLICAS
+  replicaCount: $REDIS_REPLICAS
 sentinel:
   enabled: true
 EOF
@@ -34,14 +34,14 @@ else
   echo "Helm $REDIS_NAME NOT FOUND. Beginning deployment..."
 
   helm install $REDIS_NAME-sentinel $REDIS_HELM_CHART --values values.yml
-
-  # Set best-effort resource limits for the deployment
-  echo "Setting best-effort resource limits for the deployment..."
-  oc set resources deployment/$REDIS_NAME --limits=cpu=0,memory=0 --requests=cpu=0,memory=0
 fi
 
 echo "Helm updates completed for $REDIS_NAME."
 
+# Set best-effort resource limits for the deployment
+echo "Setting best-effort resource limits for the deployment..."
+oc set resources deployment/$REDIS_NAME --limits=cpu=0,memory=0 --requests=cpu=0,memory=0
+
 # Clean up the temporary values file
 rm values.yaml