summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-09 16:39:13 +0000
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2018-11-09 16:39:13 +0000
commitb7951d682e6f72be55f42e30e415fba71ad43cc9 (patch)
treedb947dfd0d9f7dae3ded328cb6c78ef290f320b6
parent8d74ef331c4f2d391279f178ebb02c28a56205ac (diff)
parentf7f42cf34553f93c875186f61efc5909d0099cd4 (diff)
downloadgitlab-ce-b7951d682e6f72be55f42e30e415fba71ad43cc9.tar.gz
Merge branch '53621-review-app-credentials-does-not-reliably-work' into 'master'
Ensure we create the secrets at the right time Closes #53621 See merge request gitlab-org/gitlab-ce!22938
-rw-r--r--.gitlab-ci.yml1
-rwxr-xr-xscripts/review_apps/review-apps.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e7a67f9cc1..407cd8696a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -954,7 +954,6 @@ review:
- download_gitlab_chart
- ensure_namespace
- install_tiller
- - create_secret
- install_external_dns
- deploy
environment:
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh
index d372bcbdab1..016682e5a3d 100755
--- a/scripts/review_apps/review-apps.sh
+++ b/scripts/review_apps/review-apps.sh
@@ -126,6 +126,9 @@ function deploy() {
delete
cleanup
fi
+
+ create_secret
+
helm repo add gitlab https://charts.gitlab.io/
helm dep update .