summaryrefslogtreecommitdiff
path: root/lib/gitlab/ci/templates
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-10-03 23:04:18 +1300
committerThong Kuah <tkuah@gitlab.com>2018-10-05 11:45:11 +1300
commit2062560ef9480d6fa07a95d9ef1a7f6fab5317f5 (patch)
tree7cfa6b254cbc169ae602c013b66fda2878fbbaef /lib/gitlab/ci/templates
parentf71c497f5da791a35876206255e342a9bb5e49c5 (diff)
downloadgitlab-ce-2062560ef9480d6fa07a95d9ef1a7f6fab5317f5.tar.gz
Use tiller directly for Auto DevOps
This saves a external network call to fetch a helm plugin. The cost is a few lines of shell script
Diffstat (limited to 'lib/gitlab/ci/templates')
-rw-r--r--lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml7
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..7ab814a0ed8 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 &
+ echo "Tiller is listening on ${HELM_HOST}"
if ! helm version --debug; then
echo "Failed to init Tiller."