diff options
author | Rémy Coutable <remy@rymai.me> | 2019-06-20 10:59:31 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2019-06-25 11:09:06 +0200 |
commit | e266911019f66e1e9b1082f72d2663441167b810 (patch) | |
tree | 653c647691c82a3498044a285e30c4bc513b95da /scripts | |
parent | a90f12f77da832d27127e87f4969b11b5c0e7a8b (diff) | |
download | gitlab-ce-e266911019f66e1e9b1082f72d2663441167b810.tar.gz |
Install Helm on dedicated nodesimprove-review-apps-cleanup-when-previous-deployment-failed
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 358bb93da02..633ea28e96c 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -66,7 +66,7 @@ function get_pod() { if [[ "${elapsed_seconds}" -gt "${max_seconds}" ]]; then echoerr "The pod name couldn't be found after ${elapsed_seconds} seconds, aborting." - echo "" && return 0 + break fi printf "." @@ -103,9 +103,16 @@ function install_tiller() { echoinfo "Initiating the Helm client..." helm init --client-only + # Set toleration for Tiller to be installed on a specific node pool helm init \ + --wait \ --upgrade \ - --replicas 2 + --node-selectors "app=helm" \ + --replicas 3 \ + --override "spec.template.spec.tolerations[0].key"="dedicated" \ + --override "spec.template.spec.tolerations[0].operator"="Equal" \ + --override "spec.template.spec.tolerations[0].value"="helm" \ + --override "spec.template.spec.tolerations[0].effect"="NoSchedule" kubectl rollout status -n "$TILLER_NAMESPACE" -w "deployment/tiller-deploy" |