Commit 92931a2d authored by Albert Salim's avatar Albert Salim

Merge branch 'ml-assign-gitaly-pods-to-non-preemptible-nodes' into 'master'

Assign Gitaly Review App pods to non-preemptible nodes

See merge request gitlab-org/gitlab!65938
parents c4ea733a 95fc293d
...@@ -10,6 +10,8 @@ global: ...@@ -10,6 +10,8 @@ global:
secretName: review-apps-tls secretName: review-apps-tls
initialRootPassword: initialRootPassword:
secret: shared-gitlab-initial-root-password secret: shared-gitlab-initial-root-password
nodeSelector:
preemptible: "true"
certmanager: certmanager:
install: false install: false
gitlab: gitlab:
...@@ -24,6 +26,8 @@ gitlab: ...@@ -24,6 +26,8 @@ gitlab:
persistence: persistence:
size: 10G size: 10G
storageClass: ssd storageClass: ssd
nodeSelector:
preemptible: "false"
gitlab-exporter: gitlab-exporter:
enabled: false enabled: false
mailroom: mailroom:
...@@ -100,6 +104,8 @@ gitlab-runner: ...@@ -100,6 +104,8 @@ gitlab-runner:
limits: limits:
cpu: 1015m cpu: 1015m
memory: 150M memory: 150M
nodeSelector:
preemptible: "true"
minio: minio:
resources: resources:
requests: requests:
...@@ -108,6 +114,8 @@ minio: ...@@ -108,6 +114,8 @@ minio:
limits: limits:
cpu: 15m cpu: 15m
memory: 280M memory: 280M
nodeSelector:
preemptible: "true"
nginx-ingress: nginx-ingress:
controller: controller:
config: config:
...@@ -125,6 +133,8 @@ nginx-ingress: ...@@ -125,6 +133,8 @@ nginx-ingress:
timeoutSeconds: 5 timeoutSeconds: 5
readinessProbe: readinessProbe:
timeoutSeconds: 5 timeoutSeconds: 5
nodeSelector:
preemptible: "true"
defaultBackend: defaultBackend:
resources: resources:
requests: requests:
...@@ -133,6 +143,8 @@ nginx-ingress: ...@@ -133,6 +143,8 @@ nginx-ingress:
limits: limits:
cpu: 10m cpu: 10m
memory: 24M memory: 24M
nodeSelector:
preemptible: "true"
postgresql: postgresql:
metrics: metrics:
enabled: false enabled: false
...@@ -143,6 +155,9 @@ postgresql: ...@@ -143,6 +155,9 @@ postgresql:
limits: limits:
cpu: 1300m cpu: 1300m
memory: 1500M memory: 1500M
master:
nodeSelector:
preemptible: "true"
prometheus: prometheus:
install: false install: false
redis: redis:
...@@ -155,6 +170,9 @@ redis: ...@@ -155,6 +170,9 @@ redis:
limits: limits:
cpu: 200m cpu: 200m
memory: 130M memory: 130M
master:
nodeSelector:
preemptible: "true"
registry: registry:
hpa: hpa:
minReplicas: 1 minReplicas: 1
...@@ -165,3 +183,5 @@ registry: ...@@ -165,3 +183,5 @@ registry:
limits: limits:
cpu: 200m cpu: 200m
memory: 45M memory: 45M
nodeSelector:
preemptible: "true"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment