Commit 9e948118 authored by Kyle Wiebers's avatar Kyle Wiebers

Merge branch 'add-safe-to-evict-to-review-apps' into 'master'

Add safe-to-evict annotation to recommended review app pods

See merge request gitlab-org/gitlab!82632
parents 457e7538 6e807c0f
safe-to-evict: &safe-to-evict
cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
global: global:
appConfig: appConfig:
enableUsagePing: false enableUsagePing: false
...@@ -29,6 +32,8 @@ gitlab: ...@@ -29,6 +32,8 @@ gitlab:
storageClass: ssd storageClass: ssd
nodeSelector: nodeSelector:
preemptible: "false" preemptible: "false"
podAnnotations:
<<: *safe-to-evict
gitlab-exporter: gitlab-exporter:
enabled: false enabled: false
mailroom: mailroom:
...@@ -107,6 +112,8 @@ gitlab-runner: ...@@ -107,6 +112,8 @@ gitlab-runner:
memory: 150M memory: 150M
nodeSelector: nodeSelector:
preemptible: "true" preemptible: "true"
podAnnotations:
<<: *safe-to-evict
minio: minio:
resources: resources:
requests: requests:
...@@ -117,6 +124,8 @@ minio: ...@@ -117,6 +124,8 @@ minio:
memory: 280M memory: 280M
nodeSelector: nodeSelector:
preemptible: "true" preemptible: "true"
podAnnotations:
<<: *safe-to-evict
nginx-ingress: nginx-ingress:
controller: controller:
config: config:
...@@ -159,6 +168,8 @@ postgresql: ...@@ -159,6 +168,8 @@ postgresql:
master: master:
nodeSelector: nodeSelector:
preemptible: "false" preemptible: "false"
podAnnotations:
<<: *safe-to-evict
prometheus: prometheus:
install: false install: false
redis: redis:
...@@ -174,6 +185,8 @@ redis: ...@@ -174,6 +185,8 @@ redis:
master: master:
nodeSelector: nodeSelector:
preemptible: "true" preemptible: "true"
podAnnotations:
<<: *safe-to-evict
registry: registry:
hpa: hpa:
minReplicas: 1 minReplicas: 1
......
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