From dd1b38ccb46042ea7205577a2fc80f97694a363c Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 10 May 2021 12:22:00 +0200
Subject: [PATCH] increase many resource requests
---
ansible/roles/apps/tasks/core.yml | 3 ++-
.../apps/templates/settings/eventrouter.yaml | 4 ++--
.../roles/apps/templates/settings/ingress.yaml | 4 ++--
.../settings/local-path-provisioner.yaml | 4 ++--
.../apps/templates/settings/loki-stack.yaml | 8 ++++----
.../apps/templates/settings/nextcloud.yaml | 10 +++++-----
.../templates/settings/prometheus-stack.yaml | 18 +++++++++---------
.../apps/templates/settings/wordpress.yaml | 8 ++++----
8 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/ansible/roles/apps/tasks/core.yml b/ansible/roles/apps/tasks/core.yml
index 7cb9d2ca6..a77eefd02 100644
--- a/ansible/roles/apps/tasks/core.yml
+++ b/ansible/roles/apps/tasks/core.yml
@@ -193,7 +193,8 @@
--set syncGarbageCollection.enabled=true \
--set manifestGeneration=true \
--set git.pollInterval=1h \
- --set resources.limits.cpu=200m \
+ --set resources.requests.cpu=300m \
+ --set resources.limits.cpu=400m \
--set resources.limits.memory=600Mi \
{{ extra_opts }} flux flux
diff --git a/ansible/roles/apps/templates/settings/eventrouter.yaml b/ansible/roles/apps/templates/settings/eventrouter.yaml
index 4140013f4..8be599e67 100644
--- a/ansible/roles/apps/templates/settings/eventrouter.yaml
+++ b/ansible/roles/apps/templates/settings/eventrouter.yaml
@@ -4,7 +4,7 @@ sink: stdout
resources:
limits:
memory: 200Mi
- cpu: 20m
+ cpu: 200m
requests:
memory: 100Mi
- cpu: 10m
+ cpu: 100m
diff --git a/ansible/roles/apps/templates/settings/ingress.yaml b/ansible/roles/apps/templates/settings/ingress.yaml
index 2ed44f33a..2fe5af242 100644
--- a/ansible/roles/apps/templates/settings/ingress.yaml
+++ b/ansible/roles/apps/templates/settings/ingress.yaml
@@ -15,8 +15,8 @@ controller:
whitelist-source-range: '0.0.0.0/0'
resources:
limits:
- cpu: 100m
+ cpu: 200m
memory: 1Gi
requests:
- cpu: 50m
+ cpu: 100m
memory: 64Mi
diff --git a/ansible/roles/apps/templates/settings/local-path-provisioner.yaml b/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
index 50a6828bb..25db46090 100644
--- a/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
+++ b/ansible/roles/apps/templates/settings/local-path-provisioner.yaml
@@ -13,8 +13,8 @@ image:
resources:
requests:
- cpu: 10m
+ cpu: 200m
memory: 20Mi
limits:
- cpu: 20m
+ cpu: 400m
memory: 40Mi
diff --git a/ansible/roles/apps/templates/settings/loki-stack.yaml b/ansible/roles/apps/templates/settings/loki-stack.yaml
index defd5f5e0..c1df9b34f 100644
--- a/ansible/roles/apps/templates/settings/loki-stack.yaml
+++ b/ansible/roles/apps/templates/settings/loki-stack.yaml
@@ -3,10 +3,10 @@ loki:
enabled: true
resources:
limits:
- cpu: 20m
+ cpu: 400m
memory: 180Mi
requests:
- cpu: 10m
+ cpu: 200m
memory: 90Mi
promtail:
@@ -16,8 +16,8 @@ promtail:
fsInotifyMaxUserInstances: 512
resources:
limits:
- cpu: 120m
+ cpu: 400m
memory: 256Mi
requests:
- cpu: 60m
+ cpu: 300m
memory: 128Mi
diff --git a/ansible/roles/apps/templates/settings/nextcloud.yaml b/ansible/roles/apps/templates/settings/nextcloud.yaml
index e2308409d..4b5138520 100644
--- a/ansible/roles/apps/templates/settings/nextcloud.yaml
+++ b/ansible/roles/apps/templates/settings/nextcloud.yaml
@@ -81,7 +81,7 @@ nextcloud:
cpu: 500m
memory: 512Mi
requests:
- cpu: 100m
+ cpu: 200m
memory: 256Mi
# Enable and configure MariaDB chart
@@ -99,10 +99,10 @@ nextcloud:
existingClaim: "nextcloud-mariadb"
resources:
limits:
- cpu: 80m
+ cpu: 200m
memory: 512Mi
requests:
- cpu: 20m
+ cpu: 100m
memory: 256Mi
replication:
enabled: false
@@ -156,7 +156,7 @@ rabbitmq:
cpu: 300m
memory: 256Mi
requests:
- cpu: 30m
+ cpu: 100m
memory: 128Mi
redis:
@@ -170,7 +170,7 @@ redis:
cpu: 100m
memory: 64Mi
requests:
- cpu: 20m
+ cpu: 50m
memory: 32Mi
sociallogin:
diff --git a/ansible/roles/apps/templates/settings/prometheus-stack.yaml b/ansible/roles/apps/templates/settings/prometheus-stack.yaml
index 1f43815ef..a31be9716 100644
--- a/ansible/roles/apps/templates/settings/prometheus-stack.yaml
+++ b/ansible/roles/apps/templates/settings/prometheus-stack.yaml
@@ -114,10 +114,10 @@ prometheus:
resources:
limits:
- cpu: 40m
+ cpu: 200m
memory: 1Gi
requests:
- cpu: 10m
+ cpu: 100m
memory: 512Mi
ingress:
@@ -221,10 +221,10 @@ grafana:
resources:
limits:
- cpu: 40m
+ cpu: 200m
memory: 256Mi
requests:
- cpu: 10m
+ cpu: 100m
memory: 128Mi
#
# sidecar:
@@ -242,26 +242,26 @@ prometheusOperator:
cpu: 200m
memory: 256Mi
requests:
- cpu: 50m
+ cpu: 100m
memory: 128Mi
# priorityClassName: high-priority
prometheus-node-exporter:
resources:
limits:
- cpu: 40m
+ cpu: 200m
memory: 32Mi
requests:
- cpu: 10m
+ cpu: 100m
memory: 16Mi
# priorityClassName: high-priority
kube-state-metrics:
resources:
limits:
- cpu: 40m
+ cpu: 200m
memory: 64Mi
requests:
- cpu: 10m
+ cpu: 100m
memory: 32Mi
# priorityClassName: high-priority
diff --git a/ansible/roles/apps/templates/settings/wordpress.yaml b/ansible/roles/apps/templates/settings/wordpress.yaml
index 85905ef3b..5fa27d45d 100644
--- a/ansible/roles/apps/templates/settings/wordpress.yaml
+++ b/ansible/roles/apps/templates/settings/wordpress.yaml
@@ -50,10 +50,10 @@ database:
backup.velero.io/backup-volumes: "data"
resources:
limits:
- cpu: 20m
+ cpu: 200m
memory: 512Mi
requests:
- cpu: 10m
+ cpu: 100m
memory: 256Mi
replication:
enabled: false
@@ -62,10 +62,10 @@ database:
# crashing
resources:
limits:
- cpu: 50m
+ cpu: 500m
memory: 256Mi
requests:
- cpu: 10m
+ cpu: 100m
memory: 128Mi
ingress:
--
GitLab