linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed shellcheck warnings on bin/helm-build (#4080) 

Followup to #4058

```
$ shellcheck -x bin/helm-build; echo $?
0
```
This commit is contained in:
Alejandro Pedraza 2020-02-21 09:51:21 -05:00 committed by GitHub
parent 9b64f0dc94
commit ea523a46b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/helm-build
View File

@ -9,7 +9,7 @@ setValues() {
showErr() { showErr() {
printf "Error on exit:\n Exit code: %d\n Failed command: \"%s\"\n" $? "$BASH_COMMAND" printf "Error on exit:\n Exit code: %d\n Failed command: \"%s\"\n" $? "$BASH_COMMAND"
setValues $fullVersion "{version}" setValues "$fullVersion" "{version}"
} }
# trap the last failed command # trap the last failed command
@ -29,6 +29,7 @@ rootdir=$( cd "$bindir"/.. && pwd )
# `bin/helm-build package` assumes the presence of "$rootdir"/target/helm/index-pre.yaml which is downloaded in the chart_deploy CI job # `bin/helm-build package` assumes the presence of "$rootdir"/target/helm/index-pre.yaml which is downloaded in the chart_deploy CI job
if [ "$1" = package ]; then if [ "$1" = package ]; then
# shellcheck source=bin/_tag.sh
. "$bindir"/_tag.sh . "$bindir"/_tag.sh
tag=$(named_tag) tag=$(named_tag)
clean_head || { echo 'There are uncommitted changes'; exit 1; } clean_head || { echo 'There are uncommitted changes'; exit 1; }
@ -43,13 +44,13 @@ if [ "$1" = package ]; then
version=${BASH_REMATCH[2]} version=${BASH_REMATCH[2]}
# set version in Values files # set version in Values files
setValues "{version}" $fullVersion setValues "{version}" "$fullVersion"
"$bindir"/helm --version $version --app-version $tag -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2 "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2
"$bindir"/helm --version $version --app-version $tag -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2-cni "$bindir"/helm --version "$version" --app-version "$tag" -d "$rootdir"/target/helm package "$rootdir"/charts/linkerd2-cni
mv "$rootdir"/target/helm/index-pre.yaml "$rootdir"/target/helm/index-pre-$version.yaml mv "$rootdir"/target/helm/index-pre.yaml "$rootdir"/target/helm/index-pre-"$version".yaml
"$bindir"/helm repo index --url "https://helm.linkerd.io/$repo/" --merge "$rootdir"/target/helm/index-pre-$version.yaml "$rootdir"/target/helm "$bindir"/helm repo index --url "https://helm.linkerd.io/$repo/" --merge "$rootdir"/target/helm/index-pre-"$version".yaml "$rootdir"/target/helm
# restore version in Values files # restore version in Values files
setValues $fullVersion "{version}" setValues "$fullVersion" "{version}"
fi fi