mirror of
https://github.com/amkartashov/gf-k8s.git
synced 2026-01-10 17:39:43 +00:00
bootstrap.sh(fix): support helm values in multi-source app
This commit is contained in:
parent
2fa193e3cb
commit
a665ced474
1 changed files with 5 additions and 1 deletions
|
|
@ -85,7 +85,7 @@ function helm_render_from_source() {
|
||||||
|| release=$(yq -e '.metadata.name' ${app_file})
|
|| release=$(yq -e '.metadata.name' ${app_file})
|
||||||
local namespace=$(yq -e '.spec.destination.namespace' ${app_file})
|
local namespace=$(yq -e '.spec.destination.namespace' ${app_file})
|
||||||
local values_arg=""
|
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)
|
local values_file=$(mktemp /tmp/${release}_${chart}_${chart_version}.yaml.XXXX)
|
||||||
values_arg="--values ${values_file}"
|
values_arg="--values ${values_file}"
|
||||||
yq '.spec.source.helm.values // ""' ${app_file} > ${values_file}
|
yq '.spec.source.helm.values // ""' ${app_file} > ${values_file}
|
||||||
|
|
@ -111,6 +111,10 @@ function helm_render_from_sources() {
|
||||||
local values_arg=""
|
local values_arg=""
|
||||||
if [ -f ${values_file} ]; then
|
if [ -f ${values_file} ]; then
|
||||||
values_arg="--values ${values_file}"
|
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
|
fi
|
||||||
|
|
||||||
helm template ${release} ${chart} \
|
helm template ${release} ${chart} \
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue