From 84d2eaf0d2ea5b97a59382928441f5e00f4a206c Mon Sep 17 00:00:00 2001 From: Jonathan Sharman Date: Tue, 26 Mar 2024 10:54:36 -0700 Subject: [PATCH] chore: fix no globbing rule --- transition-scripts/helpers/helm.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/transition-scripts/helpers/helm.sh b/transition-scripts/helpers/helm.sh index 73b72b1..d56fcb9 100755 --- a/transition-scripts/helpers/helm.sh +++ b/transition-scripts/helpers/helm.sh @@ -19,12 +19,7 @@ upgrade_helm() { helm repo update } &>/dev/null - helm upgrade --install "$KEYCLOAK_HELM_DEPLOYMENT_NAME" sso-charts/sso-keycloak \ - -n "$namespace" \ - --version "$KEYCLOAK_HELM_CHART_VERSION" \ - -f "$values/values.yaml" \ - -f "$values/values-$current-$namespace-$cluster_mode.yaml" \ - "${@:3}" + helm upgrade --install "$KEYCLOAK_HELM_DEPLOYMENT_NAME" sso-charts/sso-keycloak -n "$namespace" --version "$KEYCLOAK_HELM_CHART_VERSION" -f "$values/values.yaml" -f "$values/values-$current-$namespace-$cluster_mode.yaml" "${@:3}" } upgrade_helm_active() { @@ -93,9 +88,9 @@ 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' + pvc_set=' --set patroni.persistentVolume.size=active_pvc_size' else - pvc_set="" + pvc_set='' fi #This can only work on fresh installs @@ -109,7 +104,7 @@ upgrade_helm_standby() { --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 patroni.additionalCredentials[0].password="$password_appuser1" "${pvc_set}" \ --set maintenancePage.enabled="$maintenance" \ --set maintenancePage.active="$maintenance"