diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-02-04 13:59:31 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-02-04 13:59:31 +0000 |
| commit | 6b0b14f81d6def6d74b303cd27fef6f98aaabfd0 (patch) | |
| tree | 781d8f49b61ecfbc6ccf46746dd7c7b96c4ddf9e | |
| parent | 5f964567650a164c11fe250d69ab0eeaa4e35e13 (diff) | |
| parent | 18dae64c495c6c7311477d736a65d78e6484e3ca (diff) | |
| download | gitlab-ce-6b0b14f81d6def6d74b303cd27fef6f98aaabfd0.tar.gz | |
Merge branch 'fine-tune-review-app-resource-requests' into 'master'
Fine-tune Review Apps pod resource requests
See merge request gitlab-org/gitlab-ce!24630
| -rwxr-xr-x | scripts/review_apps/review-apps.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/review_apps/review-apps.sh b/scripts/review_apps/review-apps.sh index 6e0dee9e090..f610485a700 100755 --- a/scripts/review_apps/review-apps.sh +++ b/scripts/review_apps/review-apps.sh @@ -143,11 +143,16 @@ HELM_CMD=$(cat << EOF --set global.hosts.hostSuffix="$HOST_SUFFIX" \ --set global.hosts.domain="$REVIEW_APPS_DOMAIN" \ --set certmanager.install=false \ + --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 nginx-ingress.defaultBackend.resources.requests.memory=7Mi \ + --set nginx-ingress.controller.resources.requests.memory=440M \ + --set nginx-ingress.controller.replicaCount=2 \ --set gitlab.unicorn.resources.requests.cpu=200m \ --set gitlab.sidekiq.resources.requests.cpu=100m \ + --set gitlab.sidekiq.resources.requests.memory=800M \ --set gitlab.gitlab-shell.resources.requests.cpu=100m \ --set redis.resources.requests.cpu=100m \ --set minio.resources.requests.cpu=100m \ |