summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 09:07:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-10-17 09:07:07 +0000
commit4226aca420920c1844e8eade4798a2dff188a6fc (patch)
tree2a09417654e9617a13798d97ae32c495c66d3353 /scripts
parent74b0522ed8b86edee204643c5484da1724a5a31b (diff)
downloadgitlab-ce-4226aca420920c1844e8eade4798a2dff188a6fc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts')
-rw-r--r--scripts/review_apps/base-config.yaml12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 1dc79e6d45e..3ccf2d62ae4 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -35,10 +35,10 @@ gitlab:
gitlab-shell:
resources:
requests:
- cpu: 70m
+ cpu: 125m
memory: 20M
limits:
- cpu: 140m
+ cpu: 250m
memory: 40M
maxReplicas: 3
hpa:
@@ -75,10 +75,10 @@ gitlab:
workhorse:
resources:
requests:
- cpu: 100m
+ cpu: 175m
memory: 100M
limits:
- cpu: 200m
+ cpu: 350m
memory: 200M
readinessProbe:
initialDelaySeconds: 5 # Default is 0
@@ -87,10 +87,10 @@ gitlab:
gitlab-runner:
resources:
requests:
- cpu: 300m
+ cpu: 355m
memory: 300M
limits:
- cpu: 600m
+ cpu: 710m
memory: 600M
minio:
resources: