Commit ead57862 authored by Thong Kuah's avatar Thong Kuah
Browse files

Merge branch 'fix-helm-connection-to-local-tiller' into 'master'

Fix auto-deploy deploy not working

See merge request gitlab-org/cluster-integration/auto-deploy-image!11
parents 2803dfbb fb223812
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@
auto_database_url=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${CI_ENVIRONMENT_SLUG}-postgres:5432/${POSTGRES_DB}
export DATABASE_URL=${DATABASE_URL-$auto_database_url}
export TILLER_NAMESPACE=$KUBE_NAMESPACE
export HELM_HOST="localhost:44134"

function check_kube_domain() {
  if [[ -z "$KUBE_INGRESS_BASE_DOMAIN" ]]; then
@@ -50,7 +51,6 @@ function ensure_namespace() {
function initialize_tiller() {
  echo "Checking Tiller..."

  export HELM_HOST="localhost:44134"
  nohup tiller -listen ${HELM_HOST} -alsologtostderr > /dev/null 2>&1 &
  echo "Tiller is listening on ${HELM_HOST}"