chore: remove the quote issue

bcgov · Mar 26, 2024 · 3ccd6af · 3ccd6af
1 parent 84d2eaf
commit 3ccd6af
Showing 1 changed file with 41 additions and 16 deletions.
diff --git a/transition-scripts/helpers/helm.sh b/transition-scripts/helpers/helm.sh
@@ -88,25 +88,50 @@ upgrade_helm_standby() {
   target_port=$(get_tsc_target_port "$namespace" "sso-patroni")
 
   if [ -z "$standby_pvc_size" ]; then
-    pvc_set=' --set patroni.persistentVolume.size=active_pvc_size'
+    upgrade_helm "$namespace" "standby" \
+      --set postgres.host="$target_host" \
+      --set postgres.port="$target_port" \
+      --set patroni.standby.enabled=true \
+      --set patroni.standby.host="$target_host" \
+      --set patroni.standby.port="$target_port" \
+      --set patroni.credentials.superuser.password="$password_superuser" \
+      --set patroni.credentials.admin.password="$password_admin" \
+      --set patroni.credentials.standby.password="$password_standby" \
+      --set patroni.additionalCredentials[0].username="$username_appuser1" \
+      --set patroni.additionalCredentials[0].password="$password_appuser1" \
+      --set patroni.persistentVolume.size=active_pvc_size \
+      --set maintenancePage.enabled="$maintenance" \
+      --set maintenancePage.active="$maintenance"
   else
-    pvc_set=''
+    upgrade_helm "$namespace" "standby" \
+      --set postgres.host="$target_host" \
+      --set postgres.port="$target_port" \
+      --set patroni.standby.enabled=true \
+      --set patroni.standby.host="$target_host" \
+      --set patroni.standby.port="$target_port" \
+      --set patroni.credentials.superuser.password="$password_superuser" \
+      --set patroni.credentials.admin.password="$password_admin" \
+      --set patroni.credentials.standby.password="$password_standby" \
+      --set patroni.additionalCredentials[0].username="$username_appuser1" \
+      --set patroni.additionalCredentials[0].password="$password_appuser1" \
+      --set maintenancePage.enabled="$maintenance" \
+      --set maintenancePage.active="$maintenance"
   fi
 
-  #This can only work on fresh installs
-  upgrade_helm "$namespace" "standby" \
-    --set postgres.host="$target_host" \
-    --set postgres.port="$target_port" \
-    --set patroni.standby.enabled=true \
-    --set patroni.standby.host="$target_host" \
-    --set patroni.standby.port="$target_port" \
-    --set patroni.credentials.superuser.password="$password_superuser" \
-    --set patroni.credentials.admin.password="$password_admin" \
-    --set patroni.credentials.standby.password="$password_standby" \
-    --set patroni.additionalCredentials[0].username="$username_appuser1" \
-    --set patroni.additionalCredentials[0].password="$password_appuser1" "${pvc_set}" \
-    --set maintenancePage.enabled="$maintenance" \
-    --set maintenancePage.active="$maintenance"
+  # #This can only work on fresh installs
+  # upgrade_helm "$namespace" "standby" \
+  #   --set postgres.host="$target_host" \
+  #   --set postgres.port="$target_port" \
+  #   --set patroni.standby.enabled=true \
+  #   --set patroni.standby.host="$target_host" \
+  #   --set patroni.standby.port="$target_port" \
+  #   --set patroni.credentials.superuser.password="$password_superuser" \
+  #   --set patroni.credentials.admin.password="$password_admin" \
+  #   --set patroni.credentials.standby.password="$password_standby" \
+  #   --set patroni.additionalCredentials[0].username="$username_appuser1" \
+  #   --set patroni.additionalCredentials[0].password="$password_appuser1" ${pvc_set} \
+  #   --set maintenancePage.enabled="$maintenance" \
+  #   --set maintenancePage.active="$maintenance"
 
   connect_route_to_correct_service "$maintenance" "$namespace"
 }