diff --git a/Changelog.md b/Changelog.md index cb3bdca86909eb1709dace23cd0afe9df961f3a8..9bcb1365925f30619f27203327ee53cbab3d469e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,10 @@ # Changelog +## [1.5.0-rc2] - 2020-12-18 +### Fixes +* fixing _--timeout_ setting to **helm** install routine and setting new default of 120s +* cmp. _--timeout_ variable has to be pattern of [Golang duration](https://golang.org/pkg/time/#ParseDuration) + ## [1.5.0-rc1] - 2020-12-18 ### Changes * upgrades **helm** to new major version v3.4.1 @@ -121,4 +126,5 @@ [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 [1.4.7]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.6...release%2F1.4.7 -[1.5.0-rc1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.7...release%2F1.5.0-rc1 \ No newline at end of file +[1.5.0-rc1]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.4.7...release%2F1.5.0-rc1 +[1.5.0-rc2]: https://git.sc.uni-leipzig.de/ubl/bdd_dev/webmasterei/deployer/compare/release%2F1.5.0-rc1...release%2F1.5.0-rc2 \ No newline at end of file diff --git a/Readme.md b/Readme.md index 3920b45a003c16d55730e1c6bba64588375b1b01..25f5f61acc99501dc2578190313b0fdaa02caa2f 100644 --- a/Readme.md +++ b/Readme.md @@ -128,7 +128,7 @@ From now on charts located in this repository can be deployed by using the `--ch * `--values`: overrides the values from `Values.yaml` in the helm-charts with values in the specified YAML file. May be provided multiple times. * `--set`: overrides the values from `Values.yaml` in the helm-charts. Provide multiple `--set`-options if you want to provide multiple overrides. * `--set-string`: overrides the values from `Values.yaml` in the helm-charts as string. Provide multiple `--set-string`-options if you want to provide multiple overrides. -* `--timeout`: sets the timeout for helm. defaults to `60` seconds. +* `--timeout`: sets the timeout for helm. defaults to `120s` seconds. String has to be a pattern of [GoLang duration](https://golang.org/pkg/time/#ParseDuration). * `--reset`: this ignores eventually existing config-folders of docker, helm and kubectl and removes them. * `--debug`: outputs executed commands diff --git a/assets/deployer b/assets/deployer index ce103dbe60bfa5ea92852d5eb2789453dd8db101..7a7bc81979371a814de7d446df74d8035ea28592 100755 --- a/assets/deployer +++ b/assets/deployer @@ -23,7 +23,7 @@ cluster_url="" service_account="" repo_url="" build_context="." -timeout="60" +timeout="120s" reset="" dockerargs="" debug=""