From a665ced474bec5732669f0157aec28a84c3c5936 Mon Sep 17 00:00:00 2001 From: Andrei Kartashov Date: Mon, 4 Sep 2023 14:10:19 +0700 Subject: [PATCH] bootstrap.sh(fix): support helm values in multi-source app --- scripts/bootstrap.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index ef6e5cc..05f064b 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -85,7 +85,7 @@ function helm_render_from_source() { || release=$(yq -e '.metadata.name' ${app_file}) local namespace=$(yq -e '.spec.destination.namespace' ${app_file}) local values_arg="" - if yq -e '.spec.source.helm | has("values")' ${app_file}; then + if yq -e '.spec.source.helm | has("values")' ${app_file} >/dev/null; then local values_file=$(mktemp /tmp/${release}_${chart}_${chart_version}.yaml.XXXX) values_arg="--values ${values_file}" yq '.spec.source.helm.values // ""' ${app_file} > ${values_file} @@ -111,6 +111,10 @@ function helm_render_from_sources() { local values_arg="" if [ -f ${values_file} ]; then values_arg="--values ${values_file}" + elif yq -e '.spec.sources[0].helm | has("values")' ${app_file} >/dev/null; then + local values_file=$(mktemp /tmp/${release}_${chart}_${chart_version}.yaml.XXXX) + values_arg="--values ${values_file}" + yq '.spec.sources[0].helm.values // ""' ${app_file} > ${values_file} fi helm template ${release} ${chart} \