From f4e004b425ac21a3a96d76e3f95abaf78d0ff9d7 Mon Sep 17 00:00:00 2001 From: Thomas Feron Date: Sun, 14 Jul 2019 10:08:15 +0100 Subject: [PATCH] Fix helm.sh when workspace is set --- helm.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/helm.sh b/helm.sh index 3567d01..487d528 100755 --- a/helm.sh +++ b/helm.sh @@ -42,7 +42,10 @@ helm init --client-only >/dev/null # Remove local repo to increase reproducibility and remove errors helm repo list |grep -qc local && $BINARY repo remove local >/dev/null -helm plugin list | grep -qc tiller || $BINARY plugin install $(dirname $(rlocation __main__/external/helm_tiller/WORKSPACE)) +HELM_TILLER="$(rlocation helm_tiller)" +HELM_TILLER=${HELM_TILLER:-external/helm_tiller} + +helm plugin list | grep -qc tiller || $BINARY plugin install "$HELM_TILLER" cd "${BUILD_WORKING_DIRECTORY:-}" helm $*