From 638a9ef575a74b4659daa8a14064b7175fe641b8 Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Tue, 22 Aug 2023 15:12:42 +0200 Subject: [PATCH] feat(ci/scripts): only add `_common.sh` to main `values.yaml` The values.yaml is the base for all the other `ci/*-values.yaml`s, therefore changing them as well is not needed --- .github/scripts/prepare-values.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/scripts/prepare-values.sh b/.github/scripts/prepare-values.sh index 5c849fb9e..0aeaa6db8 100755 --- a/.github/scripts/prepare-values.sh +++ b/.github/scripts/prepare-values.sh @@ -16,10 +16,8 @@ function prepare-values() { local valuesScript if [[ -f "$chart/ci/_common.sh" ]]; then commonValues="$("$chart/ci/_common.sh")" - for values in "$chart/values.yaml" "$chart/ci/"*-values.yaml; do - [[ -f "$values" ]] || continue - mergeYaml "$values" "$commonValues" | sponge "$values" - done + values="$chart/values.yaml" + mergeYaml "$values" "$commonValues" | sponge "$values" fi for valuesScript in "$chart/ci/"*-values.sh; do [[ -f "$valuesScript" ]] || continue