diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-11-07 15:06:33 +0000 |
commit | 90a06a20be61bb6d48d77746091492831153e075 (patch) | |
tree | bdba99289605f8b5acf12159d02aeb23f8690202 /scripts/review_apps | |
parent | 84a0e65ac88c7a3db86a0e4347606ba093490bef (diff) | |
download | gitlab-ce-90a06a20be61bb6d48d77746091492831153e075.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/review_apps')
-rw-r--r-- | scripts/review_apps/base-config.yaml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index c82075c02f3..7aaa7544c19 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -35,14 +35,17 @@ gitlab: gitlab-shell: resources: requests: - cpu: 230m + cpu: 500m memory: 25M limits: - cpu: 345m + cpu: 750m memory: 37.5M maxReplicas: 3 hpa: targetAverageValue: 130m + deployment: + livenessProbe: + timeoutSeconds: 5 sidekiq: resources: requests: |