diff options
| author | Thong Kuah <tkuah@gitlab.com> | 2019-05-20 15:55:11 +1200 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2019-05-24 14:40:12 +1200 |
| commit | f0efa2f91f8687a1cf0f39596790edaf338e8ec5 (patch) | |
| tree | 8db640fa0967104f45cfd3fe96b6ca7a884889c6 /lib | |
| parent | 7b5cc7b47e1aa0221b9aac85049388192ade4ed4 (diff) | |
| download | gitlab-ce-f0efa2f91f8687a1cf0f39596790edaf338e8ec5.tar.gz | |
Stop emitting AUTO_DEVOPS_DOMAIN Ci variable
Update documentation to reflect removal
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 |