Skip to content

Commit 79bfe14

Browse files
committed
Allow values file assembly from fragments in charts/matrix-stack/user_values too
1 parent 4b3472a commit 79bfe14

2 files changed

Lines changed: 7 additions & 1 deletion

File tree

newsfragments/604.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add the ability to generate values files in `charts/matrix-stack/user_values` from `charts/matrix-stack/ci/fragments`.

scripts/assemble_ci_values_files_from_fragments.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,16 @@ set -euo pipefail
1010

1111
scripts_dir=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
1212
values_file_root=$( cd "$scripts_dir/../charts/matrix-stack/ci" &> /dev/null && pwd )
13+
user_values_file_root=$( cd "$scripts_dir/../charts/matrix-stack/user_values" &> /dev/null && pwd )
1314
values_file_prefix="${1:-*}"
1415

1516
[ ! -d "$values_file_root" ] && echo "$values_file_root must be a directory that exists" 1>&2 && exit 1
1617

17-
for values_file in "$values_file_root"/$values_file_prefix-values.yaml; do
18+
for values_file in "$values_file_root"/$values_file_prefix-values.yaml "$user_values_file_root"/$values_file_prefix-values.yaml; do
19+
if [ "$values_file_prefix" != '*' ] && [ ! -e "$values_file" ]; then
20+
echo "$values_file_prefix-values.yaml doesn't exist in $(dirname $values_file). Skipping"
21+
continue
22+
fi
1823
if ! source_fragments=$(grep -E '#\s+source_fragments:' "$values_file" | sed 's/.*:\s*//'); then
1924
echo "$values_file doesn't have a source_fragments header comment. Skipping"
2025
continue

0 commit comments

Comments
 (0)