summaryrefslogtreecommitdiff
path: root/scripts/review_apps/base-config.yaml
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-08-19 09:08:42 +0000
commitb76ae638462ab0f673e5915986070518dd3f9ad3 (patch)
treebdab0533383b52873be0ec0eb4d3c66598ff8b91 /scripts/review_apps/base-config.yaml
parent434373eabe7b4be9593d18a585fb763f1e5f1a6f (diff)
downloadgitlab-ce-b76ae638462ab0f673e5915986070518dd3f9ad3.tar.gz
Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42
Diffstat (limited to 'scripts/review_apps/base-config.yaml')
-rw-r--r--scripts/review_apps/base-config.yaml24
1 files changed, 22 insertions, 2 deletions
diff --git a/scripts/review_apps/base-config.yaml b/scripts/review_apps/base-config.yaml
index 981a8b51674..3480b7e8bec 100644
--- a/scripts/review_apps/base-config.yaml
+++ b/scripts/review_apps/base-config.yaml
@@ -10,6 +10,8 @@ global:
secretName: review-apps-tls
initialRootPassword:
secret: shared-gitlab-initial-root-password
+ nodeSelector:
+ preemptible: "true"
certmanager:
install: false
gitlab:
@@ -24,6 +26,8 @@ gitlab:
persistence:
size: 10G
storageClass: ssd
+ nodeSelector:
+ preemptible: "false"
gitlab-exporter:
enabled: false
mailroom:
@@ -63,10 +67,10 @@ gitlab:
resources:
requests:
cpu: 300m
- memory: 800M
+ memory: 1927M
limits:
cpu: 450m
- memory: 1200M
+ memory: 2890M
webservice:
resources:
requests:
@@ -100,6 +104,8 @@ gitlab-runner:
limits:
cpu: 1015m
memory: 150M
+ nodeSelector:
+ preemptible: "true"
minio:
resources:
requests:
@@ -108,6 +114,8 @@ minio:
limits:
cpu: 15m
memory: 280M
+ nodeSelector:
+ preemptible: "true"
nginx-ingress:
controller:
config:
@@ -125,6 +133,8 @@ nginx-ingress:
timeoutSeconds: 5
readinessProbe:
timeoutSeconds: 5
+ nodeSelector:
+ preemptible: "true"
defaultBackend:
resources:
requests:
@@ -133,6 +143,8 @@ nginx-ingress:
limits:
cpu: 10m
memory: 24M
+ nodeSelector:
+ preemptible: "true"
postgresql:
metrics:
enabled: false
@@ -143,6 +155,9 @@ postgresql:
limits:
cpu: 1300m
memory: 1500M
+ master:
+ nodeSelector:
+ preemptible: "true"
prometheus:
install: false
redis:
@@ -155,6 +170,9 @@ redis:
limits:
cpu: 200m
memory: 130M
+ master:
+ nodeSelector:
+ preemptible: "true"
registry:
hpa:
minReplicas: 1
@@ -165,3 +183,5 @@ registry:
limits:
cpu: 200m
memory: 45M
+ nodeSelector:
+ preemptible: "true"