mirror of
https://github.com/kubernetes-sigs/kustomize.git
synced 2026-06-11 17:12:51 +00:00
Merge pull request #2108 from fantashley/chartinflator-helm-repo
Support third-party Helm repos in ChartInflator
This commit is contained in:
@@ -40,10 +40,11 @@ function parseYaml {
|
|||||||
local file=$1
|
local file=$1
|
||||||
while read -r line
|
while read -r line
|
||||||
do
|
do
|
||||||
local k=${line%:*}
|
local k=${line%%:*}
|
||||||
local v=${line#*:}
|
local v=${line#*:}
|
||||||
|
|
||||||
[ "$k" == "chartName" ] && chartName=$v
|
[ "$k" == "chartName" ] && chartName=$v
|
||||||
|
[ "$k" == "chartRepo" ] && chartRepo=$v
|
||||||
[ "$k" == "chartHome" ] && chartHome=$v
|
[ "$k" == "chartHome" ] && chartHome=$v
|
||||||
[ "$k" == "chartRelease" ] && chartRelease=$v
|
[ "$k" == "chartRelease" ] && chartRelease=$v
|
||||||
[ "$k" == "chartVersion" ] && chartVersion=$v
|
[ "$k" == "chartVersion" ] && chartVersion=$v
|
||||||
@@ -56,6 +57,7 @@ function parseYaml {
|
|||||||
|
|
||||||
# Trim leading space
|
# Trim leading space
|
||||||
chartName="${chartName#"${chartName%%[![:space:]]*}"}"
|
chartName="${chartName#"${chartName%%[![:space:]]*}"}"
|
||||||
|
chartRepo="${chartRepo#"${chartRepo%%[![:space:]]*}"}"
|
||||||
chartHome="${chartHome#"${chartHome%%[![:space:]]*}"}"
|
chartHome="${chartHome#"${chartHome%%[![:space:]]*}"}"
|
||||||
chartRelease="${chartRelease#"${chartRelease%%[![:space:]]*}"}"
|
chartRelease="${chartRelease#"${chartRelease%%[![:space:]]*}"}"
|
||||||
chartVersion="${chartVersion#"${chartVersion%%[![:space:]]*}"}"
|
chartVersion="${chartVersion#"${chartVersion%%[![:space:]]*}"}"
|
||||||
@@ -84,6 +86,14 @@ if [ -z "$chartRelease" ]; then
|
|||||||
chartRelease="stable"
|
chartRelease="stable"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# The repo to pull the chart from
|
||||||
|
if [ -n "$chartRepo" ]; then
|
||||||
|
chartRepoArg="--repo=$chartRepo"
|
||||||
|
chartNameArg="$chartName"
|
||||||
|
else
|
||||||
|
chartNameArg="$chartRelease/$chartName"
|
||||||
|
fi
|
||||||
|
|
||||||
# Set version only if specified
|
# Set version only if specified
|
||||||
if [ ! -z "$chartVersion" ]; then
|
if [ ! -z "$chartVersion" ]; then
|
||||||
chartVersionArg="--version=$chartVersion"
|
chartVersionArg="--version=$chartVersion"
|
||||||
@@ -114,9 +124,10 @@ doHelm init --client-only >& /dev/null
|
|||||||
|
|
||||||
if [ ! -d "$chartHome/$chartName" ]; then
|
if [ ! -d "$chartHome/$chartName" ]; then
|
||||||
doHelm fetch $chartVersionArg \
|
doHelm fetch $chartVersionArg \
|
||||||
|
$chartRepoArg \
|
||||||
--untar \
|
--untar \
|
||||||
--untardir $chartHome \
|
--untardir $chartHome \
|
||||||
${chartRelease}/$chartName
|
$chartNameArg
|
||||||
fi
|
fi
|
||||||
|
|
||||||
doHelm template \
|
doHelm template \
|
||||||
|
|||||||
Reference in New Issue
Block a user