Commit f140b011 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

feat: allow override bitnami chart repository URL 

This commit introduces POSTGRES_CHART_REPOSITORY variable
to override the chart path for PostgreSQL installation.
This is currently pointing to bitnami hosted repository.
parent a22b1c4c

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

+17 −0
Original line number Diff line number Diff line
@@ -115,6 +115,23 @@ test-download-protected-chart-url: 
    - auto-deploy download_chart

    - ./test/verify-chart-version 2



test-default-postgres-chart:

  <<: *test-job

  variables:

    POSTGRES_ENABLED: "true"

  script:

    - auto-deploy download_chart

    - (helm repo ls | grep -q 'https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami') || exit 1



test-override-postgres-chart:

  <<: *test-job

  variables:

    POSTGRES_ENABLED: "true"

    POSTGRES_CHART_REPOSITORY: https://charts.bitnami.com/bitnami

  script:

    - auto-deploy download_chart

    - (helm repo ls | grep -q https://charts.bitnami.com/bitnami) || exit 1



test-deploy-name:

  <<: *test-job

  variables:

src/bin/auto-deploy

+4 −2
Original line number Diff line number Diff line
@@ -11,6 +11,9 @@ export POSTGRES_VERSION="${POSTGRES_VERSION:-"9.6.16"}" 
export ASSETS_DIR='/assets'

export ASSETS_CHART_DIR="${ASSETS_DIR}/auto-deploy-app"

export ROLLOUT_RESOURCE_TYPE="${ROLLOUT_RESOURCE_TYPE:-deployment}"

# See https://github.com/bitnami/charts/issues/10545

export DEFAULT_BITNAMI_REPOSITORY="https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami"

export POSTGRES_CHART_REPOSITORY=${POSTGRES_CHART_REPOSITORY:-$DEFAULT_BITNAMI_REPOSITORY}



if [[ -z "$KUBE_NAMESPACE" ]]; then

  context_namespace=$(kubectl config view --minify -o jsonpath='{..namespace}' 2>/dev/null || true)
@@ -77,8 +80,7 @@ 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

    # See https://github.com/bitnami/charts/issues/10545

    helm repo add bitnami https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami

    helm repo add bitnami "$POSTGRES_CHART_REPOSITORY"

  fi

  # Additionaly, users can specify their custom chart repository.

  add_custom_chart_repository