summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Lei <jacklei1589@gmail.com>2019-06-13 22:09:28 +0000
committerThong Kuah <tkuah@gitlab.com>2019-06-13 22:09:28 +0000
commit0b75ef09d2fc48d764d26515441de2b3d0a78190 (patch)
tree7108b550971ea05b2cdbc5f0e0c4f9df12482085
parent26586209890d1b36b4e0eb7591d881e460a46d7f (diff)
downloadgitlab-ce-0b75ef09d2fc48d764d26515441de2b3d0a78190.tar.gz
AutoDevops fix ensure_namespace() does not explicitly test namespace
-rw-r--r--changelogs/unreleased/ensure_namespace.yml5
-rw-r--r--lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml2
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/ensure_namespace.yml b/changelogs/unreleased/ensure_namespace.yml
new file mode 100644
index 00000000000..ce2a615af1f
--- /dev/null
+++ b/changelogs/unreleased/ensure_namespace.yml
@@ -0,0 +1,5 @@
+---
+title: AutoDevops function ensure_namespace() now explicitly tests the namespace
+merge_request: 29567
+author: Jack Lei
+type: fixed
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index 1d55c64ec56..dcf8254ef94 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -505,7 +505,7 @@ rollout 100%:
}
function ensure_namespace() {
- kubectl describe namespace "$KUBE_NAMESPACE" || kubectl create namespace "$KUBE_NAMESPACE"
+ kubectl get namespace "$KUBE_NAMESPACE" || kubectl create namespace "$KUBE_NAMESPACE"
}
function check_kube_domain() {