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

Merge branch 'add-default-rollout-resource-type' into 'master' 

fix: add default ROLLOUT_RESOURCE_TYPE=deployment

See merge request gitlab-org/cluster-integration/auto-deploy-image!215
parents 3b4a4096 da00671e

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

+0 −1
Original line number Diff line number Diff line
@@ -266,7 +266,6 @@ test-deploy: 
    CI_PROJECT_VISIBILITY: public

    KUBE_NAMESPACE: default

    KUBE_INGRESS_BASE_DOMAIN: example.com

    ROLLOUT_RESOURCE_TYPE: deployment

    POSTGRES_USER: user

    POSTGRES_PASSWORD: testing-password

    POSTGRES_ENABLED: "true"

src/bin/auto-deploy

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ export POSTGRESQL_RELEASE_NAME="${RELEASE_NAME}-postgresql" 
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}"



function check_kube_domain() {

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