diff options
author | Thong Kuah <tkuah@gitlab.com> | 2019-04-05 23:36:59 +1300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2019-04-05 23:36:59 +1300 |
commit | 5431ccd6f5aa8f22d689da3c1dc4bde6798e22fe (patch) | |
tree | bab226ed23072578513af868c92738f0263c711e | |
parent | 12b13ae25dcac6f83cbc717b7d37825ef9cff962 (diff) | |
download | gitlab-ce-auto-deploy-image-extraction.tar.gz |
Extract some functions out to auto-deploy-imageauto-deploy-image-extraction
-rw-r--r-- | lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml index 1e9591e113b..b06e42db005 100644 --- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml +++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml @@ -503,29 +503,6 @@ 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 "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 - fi - } - function initialize_tiller() { echo "Checking Tiller..." |