Merge branch '51942-auto-devops-local-tiller' into 'master'

Use tiller locally for Auto Devops

Closes #51942

See merge request gitlab-org/gitlab-ce!22036

2 files changed, 23 insertions, 9 deletions

diff --git a/changelogs/unreleased/51942-auto-devops-local-tiller.yml b/changelogs/unreleased/51942-auto-devops-local-tiller.yml
new file mode 100644
index 00000000000..0088d6dc598
--- /dev/null
+++ b/changelogs/unreleased/51942-auto-devops-local-tiller.yml
@@ -0,0 +1,5 @@
+---
+title: Use local tiller for Auto DevOps
+merge_request: 22036
+author:
+type: changed
diff --git a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
index aebaf2d6982..9d01bcb7ca6 100644
--- a/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml
@@ -49,7 +49,7 @@ variables:
   POSTGRES_DB: $CI_ENVIRONMENT_SLUG
 
   KUBERNETES_VERSION: 1.8.6
-  HELM_VERSION: 2.10.0
+  HELM_VERSION: 2.11.0
 
   DOCKER_DRIVER: overlay2
 
@@ -239,7 +239,7 @@ review:
     - install_dependencies
     - download_chart
     - ensure_namespace
-    - install_tiller
+    - initialize_tiller
     - create_secret
     - deploy
     - persist_environment_url
@@ -265,6 +265,7 @@ stop_review:
     GIT_STRATEGY: none
   script:
     - install_dependencies
+    - initialize_tiller
     - delete
   environment:
     name: review/$CI_COMMIT_REF_NAME
@@ -299,7 +300,7 @@ staging:
     - install_dependencies
     - download_chart
     - ensure_namespace
-    - install_tiller
+    - initialize_tiller
     - create_secret
     - deploy
   environment:
@@ -323,7 +324,7 @@ canary:
     - install_dependencies
     - download_chart
     - ensure_namespace
-    - install_tiller
+    - initialize_tiller
     - create_secret
     - deploy canary
   environment:
@@ -344,7 +345,7 @@ canary:
     - install_dependencies
     - download_chart
     - ensure_namespace
-    - install_tiller
+    - initialize_tiller
     - create_secret
     - deploy
     - delete canary
@@ -392,7 +393,7 @@ production_manual:
     - install_dependencies
     - download_chart
     - ensure_namespace
-    - install_tiller
+    - initialize_tiller
     - create_secret
     - deploy rollout $ROLLOUT_PERCENTAGE
     - scale stable $((100-ROLLOUT_PERCENTAGE))
@@ -651,7 +652,12 @@ rollout 100%:
 
     curl "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx
     mv linux-amd64/helm /usr/bin/
+    mv linux-amd64/tiller /usr/bin/
     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
@@ -758,10 +764,13 @@ rollout 100%:
     echo ""
   }
 
-  function install_tiller() {
+  function initialize_tiller() {
     echo "Checking Tiller..."
-    helm init --upgrade
-    kubectl rollout status -n "$TILLER_NAMESPACE" -w "deployment/tiller-deploy"
+
+    helm local start
+    helm local status
+    export HELM_HOST=":44134"
+
     if ! helm version --debug; then
       echo "Failed to init Tiller."
       return 1