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

Merge branch 'remove-explicit-service-enabled-flag' into 'master' 

Remove explicit setting of service.enabled to allow the user to override in .auto-deploy-values

See merge request gitlab-org/cluster-integration/auto-deploy-image!55
parents 02ac4b4f 2a8430ac

src/bin/auto-deploy

+0 −4
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ function deploy() { 
    image_tag=${CI_APPLICATION_TAG:-$CI_COMMIT_TAG}

  fi



  local service_enabled="true"

  local old_postgres_enabled_for_track="$old_postgres_enabled"

  local postgres_managed="$AUTO_DEVOPS_POSTGRES_MANAGED"

  local postgres_managed_selector="$AUTO_DEVOPS_POSTGRES_MANAGED_CLASS_SELECTOR"
@@ -169,7 +168,6 @@ function deploy() { 
  # if track is different than stable,

  # re-use all attached resources

  if [[ "$track" != "stable" ]]; then

    service_enabled="false"

    old_postgres_enabled_for_track="false"

  fi
@@ -215,7 +213,6 @@ function deploy() { 
    # shellcheck disable=SC2086 # HELM_UPGRADE_EXTRA_ARGS -- double quote variables to prevent globbing

    helm upgrade --install \

      --wait \

      --set service.enabled="true" \

      --set gitlab.app="$CI_PROJECT_PATH_SLUG" \

      --set gitlab.env="$CI_ENVIRONMENT_SLUG" \

      --set gitlab.envName="$CI_ENVIRONMENT_NAME" \
@@ -253,7 +250,6 @@ function deploy() { 
  # shellcheck disable=SC2086 # HELM_UPGRADE_EXTRA_ARGS -- double quote variables to prevent globbing

  helm upgrade --install \

    --wait \

    --set service.enabled="$service_enabled" \

    --set gitlab.app="$CI_PROJECT_PATH_SLUG" \

    --set gitlab.env="$CI_ENVIRONMENT_SLUG" \

    --set gitlab.envName="$CI_ENVIRONMENT_NAME" \