From 24d6dfd59e92fb26b98f27912460246dc6902710 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 20 Sep 2021 12:10:02 +0200
Subject: [PATCH] edit resource requests to make sure everything can run on a 6
 core machine

---
 .../kube-prometheus-stack-values-configmap.yaml           | 6 +++---
 flux2/apps/monitoring/loki-values-configmap.yaml          | 2 +-
 flux2/apps/nextcloud/nextcloud-values-configmap.yaml      | 8 ++++++++
 flux2/apps/wekan/wekan-values-configmap.yaml              | 2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
index 76902ec39..a1095fc15 100644
--- a/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
+++ b/flux2/apps/monitoring/kube-prometheus-stack-values-configmap.yaml
@@ -115,7 +115,7 @@ data:
             cpu: 1
             memory: 1.5Gi
           requests:
-            cpu: 500m
+            cpu: 300m
             memory: 1Gi
 
       ingress:
@@ -241,7 +241,7 @@ data:
           cpu: 400m
           memory: 256Mi
         requests:
-          cpu: 200m
+          cpu: 100m
           memory: 128Mi
     #  priorityClassName: high-priority
 
@@ -251,7 +251,7 @@ data:
           cpu: 800m
           memory: 64Mi
         requests:
-          cpu: 200m
+          cpu: 100m
           memory: 32Mi
     #  priorityClassName: high-priority
 
diff --git a/flux2/apps/monitoring/loki-values-configmap.yaml b/flux2/apps/monitoring/loki-values-configmap.yaml
index d8de4b0e3..2708d647c 100644
--- a/flux2/apps/monitoring/loki-values-configmap.yaml
+++ b/flux2/apps/monitoring/loki-values-configmap.yaml
@@ -11,7 +11,7 @@ data:
         cpu: 800m
         memory: 768Mi
       requests:
-        cpu: 400m
+        cpu: 300m
         memory: 512Mi
     persistence:
       enabled: true
diff --git a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
index d69e27129..33038f598 100644
--- a/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
+++ b/flux2/apps/nextcloud/nextcloud-values-configmap.yaml
@@ -21,6 +21,14 @@ data:
             password: "${outgoing_mail_smtp_password}"
             authtype: "${outgoing_mail_smtp_authtype}"
 
+      # Cronjob by default requests the same as nextcloud app, but that's not
+      # necessary
+      cronjob:
+        resources:
+          request:
+            cpu: 100m
+            memory: 128Mi
+
       ingress:
         enabled: true
         annotations:
diff --git a/flux2/apps/wekan/wekan-values-configmap.yaml b/flux2/apps/wekan/wekan-values-configmap.yaml
index 97fc8a8c5..b0d92a8a4 100644
--- a/flux2/apps/wekan/wekan-values-configmap.yaml
+++ b/flux2/apps/wekan/wekan-values-configmap.yaml
@@ -111,5 +111,5 @@ data:
           cpu: 1
           memory: 1024Mi
         requests:
-          cpu: 512m
+          cpu: 400m
           memory: 768Mi
-- 
GitLab