diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-14 18:17:06 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-14 18:17:06 +0300 |
commit | be320585cb65cc36aa94797ea71853c7e8d70048 (patch) | |
tree | f3adafb0a81f9fdfc7dde0352e808a1fd57557c1 /scripts/review_apps | |
parent | 79a7da2537e94c34aba92ad4b9a5dc1da431b2c4 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
-rwxr-xr-x | scripts/review_apps/review-apps.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 88913b4e972..c122cb0f90c 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -263,6 +263,12 @@ function deploy() { gitaly_image_tag=$(parse_gitaly_image_tag) gitlab_shell_image_repository="${IMAGE_REPOSITORY}/gitlab-shell" gitlab_workhorse_image_repository="${IMAGE_REPOSITORY}/gitlab-workhorse-ee" + sentry_enabled="false" + + if [ -n ${REVIEW_APPS_SENTRY_DSN} ]; then + echo "REVIEW_APPS_SENTRY_DSN detected, enabling Sentry" + sentry_enabled="true" + fi ensure_namespace "${namespace}" label_namespace "${namespace}" "tls=review-apps-tls" # label namespace for kubed to sync tls @@ -283,6 +289,9 @@ HELM_CMD=$(cat << EOF --set releaseOverride="${release}" \ --set global.hosts.hostSuffix="${HOST_SUFFIX}" \ --set global.hosts.domain="${REVIEW_APPS_DOMAIN}" \ + --set global.sentry.enabled="${sentry_enabled}" \ + --set global.sentry.dsn="${REVIEW_APPS_SENTRY_DSN}" \ + --set global.sentry.environment="review" \ --set gitlab.migrations.image.repository="${gitlab_toolbox_image_repository}" \ --set gitlab.migrations.image.tag="${CI_COMMIT_REF_SLUG}" \ --set gitlab.gitaly.image.repository="${gitlab_gitaly_image_repository}" \ |