diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-22 11:31:16 +0000 |
commit | 905c1110b08f93a19661cf42a276c7ea90d0a0ff (patch) | |
tree | 756d138db422392c00471ab06acdff92c5a9b69c /scripts/review_apps/base-config.yaml | |
parent | 50d93f8d1686950fc58dda4823c4835fd0d8c14b (diff) | |
download | gitlab-ce-905c1110b08f93a19661cf42a276c7ea90d0a0ff.tar.gz |
Add latest changes from gitlab-org/gitlab@12-4-stable-ee
Diffstat (limited to 'scripts/review_apps/base-config.yaml')
-rw-r--r-- | scripts/review_apps/base-config.yaml | 39 |
1 files changed, 26 insertions, 13 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml index 403c1df97aa..573a5ccde11 100644 --- a/scripts/review_apps/base-config.yaml +++ b/scripts/review_apps/base-config.yaml @@ -35,11 +35,14 @@ gitlab: gitlab-shell: resources: requests: - cpu: 70m + cpu: 125m memory: 20M limits: - cpu: 140m + cpu: 250m memory: 40M + maxReplicas: 3 + hpa: + targetAverageValue: 130m sidekiq: resources: requests: @@ -59,34 +62,43 @@ gitlab: unicorn: resources: requests: - cpu: 600m + cpu: 400m memory: 1.4G limits: - cpu: 1.2G + cpu: 800m memory: 2.8G + deployment: + readinessProbe: + initialDelaySeconds: 5 # Default is 0 + periodSeconds: 15 # Default is 10 + timeoutSeconds: 5 # Default is 2 workhorse: resources: requests: - cpu: 100m + cpu: 175m memory: 100M limits: - cpu: 200m + cpu: 350m memory: 200M + readinessProbe: + initialDelaySeconds: 5 # Default is 0 + periodSeconds: 15 # Default is 10 + timeoutSeconds: 5 # Default is 2 gitlab-runner: resources: requests: - cpu: 300m + cpu: 355m memory: 300M limits: - cpu: 600m + cpu: 710m memory: 600M minio: resources: requests: - cpu: 100m + cpu: 5m memory: 128M limits: - cpu: 200m + cpu: 10m memory: 280M nginx-ingress: controller: @@ -95,10 +107,10 @@ nginx-ingress: replicaCount: 2 resources: requests: - cpu: 150m + cpu: 100m memory: 250M limits: - cpu: 300m + cpu: 200m memory: 500M minAvailable: 1 service: @@ -141,7 +153,8 @@ redis: redis-ha: enabled: false registry: - minReplicas: 1 + hpa: + minReplicas: 1 resources: requests: cpu: 50m |