Commit b64aa930 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

DO NOT MERGE: Test how far we get with Helm 3

parent 1c17b7b4

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
variables:

  DOCKER_DRIVER: overlay2



  HELM_VERSION: 2.16.7

  HELM_VERSION: 3.2.4 # just for show on this branch -- we actually override the base image in the Dockerfile because the helm 3 image hasn't been published

  KUBERNETES_VERSION: 1.13.12

  GLIBC_VERSION: 2.31-r0

Dockerfile

+2 −1
Original line number Diff line number Diff line 
ARG HELM_VERSION

ARG KUBERNETES_VERSION



FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}"

# FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}"

FROM registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/branches/add-builds-for-helm-3:02632444149710b95a4ce0233f4f1f6242713dcc-3.2.4



# https://github.com/sgerrand/alpine-pkg-glibc

ARG GLIBC_VERSION

src/bin/auto-deploy

+1 −16
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 


[[ "$TRACE" ]] && set -x



export TILLER_NAMESPACE=$KUBE_NAMESPACE

export HELM_HOST="localhost:44134"

export AUTO_DEPLOY_ENVIRONMENT_VALUES_FILE=/tmp/auto-deploy-environment-values.yaml

export RELEASE_NAME=${HELM_RELEASE_NAME:-$CI_ENVIRONMENT_SLUG}

export POSTGRESQL_RELEASE_NAME="${RELEASE_NAME}-postgresql"
@@ -61,20 +59,7 @@ function ensure_namespace() { 
}



function initialize_tiller() {

  echo "Checking Tiller..."



  if [[ -n "$AUTO_DEVOPS_DEPLOY_DEBUG" ]]; then

    nohup tiller -listen "${HELM_HOST}" >tiller.log 2>&1 &

  else

    nohup tiller -listen "${HELM_HOST}" >/dev/null 2>&1 &

  fi

  echo "Tiller is listening on ${HELM_HOST}"



  if ! helm version --debug; then

    echo "Failed to init Tiller."

    return 1

  fi

  echo ""

  echo "Helm 3 does not have tiller"

}



function write_environment_values_file() {