Commit ac4f0c28 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'add-force-upgrade-to-helm-if-we-need-to-downgrade' into 'master'

Add the '--force-upgrade' flag to 'helm init' to allow auto-downgrade

See merge request gitlab-org/gitlab!20526
parents 69382a59 729a9d43
...@@ -129,6 +129,10 @@ two node pools: ...@@ -129,6 +129,10 @@ two node pools:
### Helm/Tiller ### Helm/Tiller
The Helm/Tiller version used is defined in the
[`registry.gitlab.com/gitlab-org/gitlab-build-images:gitlab-charts-build-base` image](https://gitlab.com/gitlab-org/gitlab-build-images/blob/master/Dockerfile.gitlab-charts-build-base#L4)
used by the `review-deploy` and `review-stop` jobs.
The `tiller` deployment (the Helm server) is deployed to a dedicated node pool The `tiller` deployment (the Helm server) is deployed to a dedicated node pool
that has the `app=helm` label and a specific that has the `app=helm` label and a specific
[taint](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) [taint](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/)
......
...@@ -141,6 +141,7 @@ function install_tiller() { ...@@ -141,6 +141,7 @@ function install_tiller() {
--tiller-namespace "${namespace}" \ --tiller-namespace "${namespace}" \
--wait \ --wait \
--upgrade \ --upgrade \
--force-upgrade \
--node-selectors "app=helm" \ --node-selectors "app=helm" \
--replicas 3 \ --replicas 3 \
--override "spec.template.spec.tolerations[0].key"="dedicated" \ --override "spec.template.spec.tolerations[0].key"="dedicated" \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment