Commit 8a16c07d authored by Dan Davison's avatar Dan Davison

Merge branch '57798-fix-auto-devops-empty-str-check' into 'master'

Fix Auto DevOps check domain is blank

Closes #57798

See merge request gitlab-org/gitlab-ce!25308
parents a6f882f3 2d300104
---
title: Prevent Auto DevOps from trying to deploy without a domain name
merge_request: 25308
author:
type: fixed
......@@ -828,7 +828,7 @@ rollout 100%:
# Function to ensure backwards compatibility with AUTO_DEVOPS_DOMAIN
function ensure_kube_ingress_base_domain() {
if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ]; then
if [ -z ${KUBE_INGRESS_BASE_DOMAIN+x} ] && [ -n "$AUTO_DEVOPS_DOMAIN" ] ; then
export KUBE_INGRESS_BASE_DOMAIN=$AUTO_DEVOPS_DOMAIN
fi
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment