diff --git a/Changelog.md b/Changelog.md index 158c616ef39f2eec86f219b5b8f95f3a6178a041..bce9027139991715ffddb765e6a0dafaebba04e6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog +## [1.4.6] - 2019-03-27 +### Added +* explicitly deleting chart when `PENDING`, `FAILED` or `DELETED` since this blocks + redeploying previous deployments + ## [1.4.5] - 2019-03-27 ### Added * git-binary to docker-image @@ -104,4 +109,5 @@ [1.4.2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.1...release%2F1.4.2 [1.4.3]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.2...release%2F1.4.3 [1.4.4]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.3...release%2F1.4.4 -[1.4.5]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.4...release%2F1.4.5 \ No newline at end of file +[1.4.5]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.4...release%2F1.4.5 +[1.4.6]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.5...release%2F1.4.6 \ No newline at end of file diff --git a/assets/deployer b/assets/deployer index 4f5a483091b63fda056d176b4330375afcfa8ebb..52646551a454aea10c88ea525e7f832c75bf146a 100755 --- a/assets/deployer +++ b/assets/deployer @@ -328,6 +328,16 @@ helm_deploy() { local out local cmd + if [ "$(helm ls --tiller-namespace=${namespace} --namespace=${namespace} --pending --deleted --failed --short | grep ${name})" != "" ];then + debug "helm delete --tiller-namespace=${namespace} --purge ${name}" + out=`helm delete --tiller-namespace=${namespace} --purge ${name} 2>&1` + if [ "$?" != "0" ];then + echo "failed" + echo "$out" + return 1 + fi + fi + helmargs=$(echo -e "$helmargs" | sed -E 's/(^[[:space:]]*)|([[:space:]]*$)//g') cmd="helm upgrade --install --wait --timeout=${timeout} --tiller-namespace=${namespace} --namespace=${namespace}" cmd="$cmd --namespace=${namespace} --force --recreate-pods ${name} ${charts} ${helmargs}"