diff --git a/plugin.yaml b/plugin.yaml index fdd021b..0c48c94 100644 --- a/plugin.yaml +++ b/plugin.yaml @@ -1,6 +1,6 @@ --- name: "tiller" -version: "0.9.0" +version: "0.9.1" usage: "Please see /~https://github.com/rimusz/helm-tiller for usage" description: "Start a Tiller server locally, aka Tillerless Helm" command: "$HELM_PLUGIN_DIR/scripts/tiller.sh" diff --git a/scripts/tiller.sh b/scripts/tiller.sh index 2b38cdd..ecf5bf0 100755 --- a/scripts/tiller.sh +++ b/scripts/tiller.sh @@ -174,8 +174,10 @@ run_tiller() { stop_tiller() { if [[ "${HELM_TILLER_SILENT}" == "false" ]]; then echo "Stopping Tiller..." + pkill -9 -f ./bin/tiller + else + pkill -9 -f ./bin/tiller &> /dev/null fi - pkill -9 -f ./bin/tiller } COMMAND=$1 @@ -208,8 +210,12 @@ start) start-ci) check_helm check_install_tiller - echo "Set the following vars to use tiller:" - helm_env "$@" + if [[ "${HELM_TILLER_SILENT}" == "false" ]]; then + echo "Set the following vars to use tiller:" + helm_env "$@" + else + helm_env "$@" &> /dev/null + fi start_tiller ;; env)