diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-06-13 13:22:36 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-06-13 13:22:36 +0200 |
| commit | de6e626a1e70e80766c31ff7444a0be283d2ffac (patch) | |
| tree | a5f97d9d8fd22647aa549774c32a779d20ce23c5 | |
| parent | 0c4059efc146c869d3ffd1bc075c67c8b4ae921d (diff) | |
| download | gitlab-ce-qa-use-deploy-boards-with-review-apps.tar.gz | |
Add Deploy Board annotations to Review Appsqa-use-deploy-boards-with-review-apps
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 9455e462617..5741d652991 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -207,6 +207,26 @@ HELM_CMD=$(cat << EOF helm upgrade --install \ --wait \ --timeout 600 \ + --set global.service.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set global.service.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set gitlab.gitaly.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set gitlab.gitaly.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set gitlab.gitlab-monitor.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set gitlab.gitlab-monitor.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set gitlab.gitlab-runner.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set gitlab.gitlab-runner.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set gitlab.sidekiq.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set gitlab.sidekiq.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set gitlab.unicorn.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set gitlab.unicorn.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set minio.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set minio.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set nginx-ingress.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set nginx-ingress.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set redis.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set redis.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ + --set registry.annotations."app\.gitlab\.com/app"="$CI_PROJECT_PATH_SLUG" \ + --set registry.annotations."app\.gitlab\.com/env"="$CI_ENVIRONMENT_SLUG" \ --set global.appConfig.enableUsagePing=false \ --set releaseOverride="$CI_ENVIRONMENT_SLUG" \ --set global.hosts.hostSuffix="$HOST_SUFFIX" \ @@ -215,7 +235,7 @@ HELM_CMD=$(cat << EOF --set prometheus.install=false \ --set global.ingress.configureCertmanager=false \ --set global.ingress.tls.secretName=tls-cert \ - --set global.ingress.annotations."external-dns\.alpha\.kubernetes\.io/ttl"="10" + --set global.ingress.annotations."external-dns\.alpha\.kubernetes\.io/ttl"="10" \ --set nginx-ingress.controller.service.enableHttp=false \ --set nginx-ingress.defaultBackend.resources.requests.memory=7Mi \ --set nginx-ingress.controller.resources.requests.memory=440M \ |