Commit 414e1ee2 authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'cond-bitnami-chart-download' into 'master' 

Only download bitnami chart if postgres is enabled

Closes #136

See merge request gitlab-org/cluster-integration/auto-deploy-image!174
parents db4e9989 480eb8c7

.gitlab/ci/test.gitlab-ci.yml

+1 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ test-install-postgres: 
    CI_ENVIRONMENT_SLUG: production

    KUBE_NAMESPACE: default

    AUTO_DEVOPS_POSTGRES_CHANNEL: 2

    POSTGRES_ENABLED: "true"

    POSTGRES_USER: user

    POSTGRES_PASSWORD: testing-password

    POSTGRES_DB: $CI_ENVIRONMENT_SLUG

src/bin/auto-deploy

+3 −1
Original line number Diff line number Diff line
@@ -62,7 +62,9 @@ function download_chart() { 
function add_chart_repositories() {

  helm repo add stable https://charts.helm.sh/stable

  # bitnami repository is used for in-cluster PostgreSQL installation.

  if [[ "$POSTGRES_ENABLED" == "true" ]]; then

    helm repo add bitnami https://charts.bitnami.com/bitnami

  fi

  # Additionaly, users can specify their custom chart repository.

  add_custom_chart_repository

}