Skip to content

Commit 037b495

Browse files
authored
Fix: Manila install-manila.sh overrides_args (#1291)
1 parent ace18ae commit 037b495

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

bin/install-manila.sh

100644100755
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fi
4242
echo "Found version for $SERVICE_NAME: $SERVICE_VERSION"
4343

4444
# Prepare an array to collect --values arguments
45-
values_args=()
45+
overrides_args=()
4646

4747
# --- Include all YAML files from the BASE configuration directory ---
4848
if [[ -d "$SERVICE_BASE_OVERRIDES" ]]; then
@@ -52,8 +52,8 @@ if [[ -d "$SERVICE_BASE_OVERRIDES" ]]; then
5252
for file in "$SERVICE_BASE_OVERRIDES"/*.yaml; do
5353
# Check that there is at least one match
5454
if [[ -e "$file" ]]; then
55-
echo " - $file"
56-
values_args+=("--values" "$file")
55+
echo " -f $file"
56+
overrides_args+=("--values" "$file")
5757
fi
5858
done
5959
else
@@ -65,8 +65,8 @@ if [[ -d "$GLOBAL_OVERRIDES_DIR" ]]; then
6565
echo "Including overrides from global config directory:"
6666
for file in "$GLOBAL_OVERRIDES_DIR"/*.yaml; do
6767
if [[ -e "$file" ]]; then
68-
echo " - $file"
69-
values_args+=("--values" "$file")
68+
echo " -f $file"
69+
overrides_args+=("--values" "$file")
7070
fi
7171
done
7272
else
@@ -78,8 +78,8 @@ if [[ -d "$SERVICE_CUSTOM_OVERRIDES" ]]; then
7878
echo "Including overrides from service config directory:"
7979
for file in "$SERVICE_CUSTOM_OVERRIDES"/*.yaml; do
8080
if [[ -e "$file" ]]; then
81-
echo " - $file"
82-
values_args+=("--values" "$file")
81+
echo " -f $file"
82+
overrides_args+=("-f" "$file")
8383
fi
8484
done
8585
else
@@ -114,7 +114,7 @@ helm_command=(
114114
--timeout 120m
115115
--create-namespace
116116

117-
"${values_args[@]}"
117+
"${overrides_args[@]}"
118118
"${set_args[@]}"
119119

120120
# Post-renderer configuration

0 commit comments

Comments
 (0)