Commit 49e08372 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents 4f4c1134 c9530356
---
title: Use local tiller for Auto DevOps
merge_request: 22036
author:
type: changed
...@@ -49,7 +49,7 @@ variables: ...@@ -49,7 +49,7 @@ variables:
POSTGRES_DB: $CI_ENVIRONMENT_SLUG POSTGRES_DB: $CI_ENVIRONMENT_SLUG
KUBERNETES_VERSION: 1.8.6 KUBERNETES_VERSION: 1.8.6
HELM_VERSION: 2.10.0 HELM_VERSION: 2.11.0
DOCKER_DRIVER: overlay2 DOCKER_DRIVER: overlay2
...@@ -239,7 +239,7 @@ review: ...@@ -239,7 +239,7 @@ review:
- install_dependencies - install_dependencies
- download_chart - download_chart
- ensure_namespace - ensure_namespace
- install_tiller - initialize_tiller
- create_secret - create_secret
- deploy - deploy
- persist_environment_url - persist_environment_url
...@@ -265,6 +265,7 @@ stop_review: ...@@ -265,6 +265,7 @@ stop_review:
GIT_STRATEGY: none GIT_STRATEGY: none
script: script:
- install_dependencies - install_dependencies
- initialize_tiller
- delete - delete
environment: environment:
name: review/$CI_COMMIT_REF_NAME name: review/$CI_COMMIT_REF_NAME
...@@ -299,7 +300,7 @@ staging: ...@@ -299,7 +300,7 @@ staging:
- install_dependencies - install_dependencies
- download_chart - download_chart
- ensure_namespace - ensure_namespace
- install_tiller - initialize_tiller
- create_secret - create_secret
- deploy - deploy
environment: environment:
...@@ -323,7 +324,7 @@ canary: ...@@ -323,7 +324,7 @@ canary:
- install_dependencies - install_dependencies
- download_chart - download_chart
- ensure_namespace - ensure_namespace
- install_tiller - initialize_tiller
- create_secret - create_secret
- deploy canary - deploy canary
environment: environment:
...@@ -344,7 +345,7 @@ canary: ...@@ -344,7 +345,7 @@ canary:
- install_dependencies - install_dependencies
- download_chart - download_chart
- ensure_namespace - ensure_namespace
- install_tiller - initialize_tiller
- create_secret - create_secret
- deploy - deploy
- delete canary - delete canary
...@@ -392,7 +393,7 @@ production_manual: ...@@ -392,7 +393,7 @@ production_manual:
- install_dependencies - install_dependencies
- download_chart - download_chart
- ensure_namespace - ensure_namespace
- install_tiller - initialize_tiller
- create_secret - create_secret
- deploy rollout $ROLLOUT_PERCENTAGE - deploy rollout $ROLLOUT_PERCENTAGE
- scale stable $((100-ROLLOUT_PERCENTAGE)) - scale stable $((100-ROLLOUT_PERCENTAGE))
...@@ -651,7 +652,12 @@ rollout 100%: ...@@ -651,7 +652,12 @@ rollout 100%:
curl "https://kubernetes-helm.storage.googleapis.com/helm-v${HELM_VERSION}-linux-amd64.tar.gz" | tar zx 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/helm /usr/bin/
mv linux-amd64/tiller /usr/bin/
helm version --client 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" 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 chmod +x /usr/bin/kubectl
...@@ -758,10 +764,13 @@ rollout 100%: ...@@ -758,10 +764,13 @@ rollout 100%:
echo "" echo ""
} }
function install_tiller() { function initialize_tiller() {
echo "Checking 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 if ! helm version --debug; then
echo "Failed to init Tiller." echo "Failed to init Tiller."
return 1 return 1
......
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