From 7b83a3009bec785718b36f0c877a30018c97adfa Mon Sep 17 00:00:00 2001
From: Massaki Archambault <marchambault@badjware.dev>
Date: Sun, 26 Dec 2021 01:58:38 -0500
Subject: [PATCH] ajust limits and requests

---
 .../drone-runner/drone-runner-deployment.yaml    |  8 ++++----
 .../drone-server/drone-server-deployment.yaml    |  6 +++---
 kustomize/bases/gitea/gitea-deployment.yaml      |  6 +++---
 kustomize/bases/grafana/grafana-deployment.yaml  |  4 ++--
 .../helium-blockchain-exporter-deployment.yaml   |  6 +++---
 .../bases/nextcloud/nextcloud-deployment.yaml    | 16 +++-------------
 .../bases/postgres/postgres-statefulset.yaml     |  2 +-
 kustomize/bases/prometheus/prometheus.yaml       |  2 +-
 kustomize/bases/redis/redis-deployment.yaml      |  8 ++++----
 9 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/kustomize/bases/drone-runner/drone-runner-deployment.yaml b/kustomize/bases/drone-runner/drone-runner-deployment.yaml
index c706785..04479f7 100644
--- a/kustomize/bases/drone-runner/drone-runner-deployment.yaml
+++ b/kustomize/bases/drone-runner/drone-runner-deployment.yaml
@@ -38,11 +38,11 @@ spec:
               containerPort: 3000
           resources:
             requests:
-              cpu: 250m
-              memory: 250Mi
+              cpu: 100m
+              memory: 100Mi
             limits:
-              cpu: 500m
-              memory: 500Mi
+              cpu: 100m
+              memory: 250Mi
 ---
 kind: Role
 apiVersion: rbac.authorization.k8s.io/v1
diff --git a/kustomize/bases/drone-server/drone-server-deployment.yaml b/kustomize/bases/drone-server/drone-server-deployment.yaml
index df2065b..4f27e1f 100644
--- a/kustomize/bases/drone-server/drone-server-deployment.yaml
+++ b/kustomize/bases/drone-server/drone-server-deployment.yaml
@@ -57,10 +57,10 @@ spec:
           resources:
             requests:
               cpu: 250m
-              memory: 250Mi
+              memory: 100Mi
             limits:
-              cpu: 500m
-              memory: 500Mi
+              cpu: 250m
+              memory: 250Mi
           volumeMounts:
             - mountPath: /data
               name: drone-server-pv
diff --git a/kustomize/bases/gitea/gitea-deployment.yaml b/kustomize/bases/gitea/gitea-deployment.yaml
index 38e6db3..281ad1e 100644
--- a/kustomize/bases/gitea/gitea-deployment.yaml
+++ b/kustomize/bases/gitea/gitea-deployment.yaml
@@ -43,11 +43,11 @@ spec:
               containerPort: 22
           resources:
             requests:
+              cpu: 250m
+              memory: 250Mi
+            limits:
               cpu: 500m
               memory: 500Mi
-            limits:
-              cpu: 750m
-              memory: 750Mi
           volumeMounts:
             - name: gitea-pv
               mountPath: /data
diff --git a/kustomize/bases/grafana/grafana-deployment.yaml b/kustomize/bases/grafana/grafana-deployment.yaml
index 250b3c9..3a97908 100644
--- a/kustomize/bases/grafana/grafana-deployment.yaml
+++ b/kustomize/bases/grafana/grafana-deployment.yaml
@@ -59,10 +59,10 @@ spec:
           resources:
             requests:
               cpu: 250m
-              memory: 500Mi
+              memory: 250Mi
             limits:
               cpu: 500m
-              memory: 750Mi
+              memory: 500Mi
           volumeMounts:
             - name: grafana-datasources
               mountPath: /etc/grafana/provisioning/datasources
diff --git a/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-deployment.yaml b/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-deployment.yaml
index dbc0de2..c4d145a 100644
--- a/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-deployment.yaml
+++ b/kustomize/bases/helium-blockchain-exporter/helium-blockchain-exporter-deployment.yaml
@@ -26,11 +26,11 @@ spec:
             - $(ACCOUNTS)
           resources:
             requests:
-              memory: 128Mi
               cpu: 100m
+              memory: 100Mi
             limits:
-              memory: 128Mi
-              cpu: 500m
+              cpu: 100m
+              memory: 100Mi
           ports:
             - containerPort: 9865
               name: http-metrics
diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
index 8652a5b..29e4a28 100644
--- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml
+++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml
@@ -66,24 +66,14 @@ spec:
               containerPort: 80
           resources:
             requests:
-              cpu: 2000m
+              cpu: 1000m
               memory: 1Gi
             limits:
-              cpu: 4000m
-              memory: 1.5Gi
+              cpu: 2000m
+              memory: 2Gi
           volumeMounts:
             - name: nextcloud-pv
               mountPath: /var/www/html
-        # - name: nextcloud-cron
-        #   image: badjware/nextcloud-tweak
-        #   command: ['cron', '-f']
-        #   volumeMounts:
-        #     - name: nextcloud-pv
-        #       mountPath: /var/www/html
-        #   resources:
-        #     limits:
-        #       cpu: 250m
-        #       memory: 250Mi
       volumes:
         - name: nextcloud-pv
           persistentVolumeClaim:
diff --git a/kustomize/bases/postgres/postgres-statefulset.yaml b/kustomize/bases/postgres/postgres-statefulset.yaml
index a1840d7..cb7f7ec 100644
--- a/kustomize/bases/postgres/postgres-statefulset.yaml
+++ b/kustomize/bases/postgres/postgres-statefulset.yaml
@@ -41,7 +41,7 @@ spec:
               containerPort: 5432
           resources:
             requests:
-              cpu: 500m
+              cpu: 250m
               memory: 1Gi
             limits:
               cpu: 1000m
diff --git a/kustomize/bases/prometheus/prometheus.yaml b/kustomize/bases/prometheus/prometheus.yaml
index a8e874a..539e47b 100644
--- a/kustomize/bases/prometheus/prometheus.yaml
+++ b/kustomize/bases/prometheus/prometheus.yaml
@@ -18,7 +18,7 @@ spec:
       monitor: prometheus
   resources:
     requests:
-      cpu: 750m
+      cpu: 500m
       memory: 2Gi
     limits:
       cpu: 1000m
diff --git a/kustomize/bases/redis/redis-deployment.yaml b/kustomize/bases/redis/redis-deployment.yaml
index 08aede8..11febf8 100644
--- a/kustomize/bases/redis/redis-deployment.yaml
+++ b/kustomize/bases/redis/redis-deployment.yaml
@@ -29,11 +29,11 @@ spec:
               containerPort: 6379
           resources:
             requests:
-              cpu: 500m
-              memory: 500Mi
+              cpu: 250m
+              memory: 250Mi
             limits:
-              cpu: 1000m
-              memory: 1Gi
+              cpu: 500m
+              memory: 250Mi
 ---
 apiVersion: v1
 kind: Service