diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-05 11:52:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-10-05 11:52:35 +0300 |
| commit | 98649bef451e647e0990b125cb9affba44b0dedb (patch) | |
| tree | f2432d47d577b5dbb465566b551ccbd649472563 /lib | |
| parent | 4e885199d71eb50d4ddb0c2c2fc4dc4235d6eb78 (diff) | |
| parent | cab875eeb7ec6babbab8e5e36c0a0ff4db77f73c (diff) | |
Merge branch '52143-use-tiller-directly' into 'master'
Use tiller directly for Auto DevOps
Closes #52143
See merge request gitlab-org/gitlab-ce!22076
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml index a96595b33a5..ed4ec7e6385 100644 --- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml @@ -689,9 +689,6 @@ rollout 100%: helm version --client tiller -version - helm init --client-only - helm plugin install https://github.com/adamreese/helm-local - curl -L -o /usr/bin/kubectl "https://storage.googleapis.com/kubernetes-release/release/v${KUBERNETES_VERSION}/bin/linux/amd64/kubectl" chmod +x /usr/bin/kubectl kubectl version --client @@ -800,9 +797,9 @@ rollout 100%: function initialize_tiller() { echo "Checking Tiller..." - helm local start - helm local status export HELM_HOST=":44134" + tiller -listen ${HELM_HOST} -alsologtostderr > /dev/null 2>&1 & + echo "Tiller is listening on ${HELM_HOST}" if ! helm version --debug; then echo "Failed to init Tiller." |