diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-24 04:08:48 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-05-24 04:08:48 +0000 |
| commit | 79fc5e139c1dbfe0f80907bc319fea135f060279 (patch) | |
| tree | f080882282abd6259a4a87646d0060ebbb746509 /lib | |
| parent | 6f4a5762dacd89508dfbe2e5d8ef91695499f14f (diff) | |
| parent | 7338052f93a82a3a6609934fa023a56080cbb330 (diff) | |
| download | gitlab-ce-79fc5e139c1dbfe0f80907bc319fea135f060279.tar.gz | |
Merge branch '56959-remove-auto-devops-domain-ci-variable' into 'master'
Drop support for AUTO_DEVOPS_DOMAIN
See merge request gitlab-org/gitlab-ce!28460
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 779f4b5f006..11569437cb6 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -507,23 +507,13 @@ rollout 100%: kubectl describe namespace "$KUBE_NAMESPACE" || kubectl create namespace "$KUBE_NAMESPACE" } - # Function to ensure backwards compatibility with AUTO_DEVOPS_DOMAIN - function ensure_kube_ingress_base_domain() { - if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then - export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN - fi - } - function check_kube_domain() { - ensure_kube_ingress_base_domain - if [[ -z "$KUBE_INGRESS_BASE_DOMAIN" ]]; then echo "In order to deploy or use Review Apps," - echo "AUTO_DEVOPS_DOMAIN or KUBE_INGRESS_BASE_DOMAIN variables must be set" + echo "KUBE_INGRESS_BASE_DOMAIN variables must be set" echo "From 11.8, you can set KUBE_INGRESS_BASE_DOMAIN in cluster settings" echo "or by defining a variable at group or project level." echo "You can also manually add it in .gitlab-ci.yml" - echo "AUTO_DEVOPS_DOMAIN support will be dropped on 12.0" false else true |