diff --git a/ansible/roles/apps/tasks/core.yml b/ansible/roles/apps/tasks/core.yml index 7cb9d2ca6ce18c42f67e0466f19190bb86692ac4..4104905b982f413f7e4859e4b223da0518bc96c6 100644 --- a/ansible/roles/apps/tasks/core.yml +++ b/ansible/roles/apps/tasks/core.yml @@ -66,6 +66,8 @@ --set configureRepositories.repositories[2].url=https://nextcloud.github.io/helm \ --set chartsSyncInterval=20m \ --set statusUpdateInterval=30s \ + --set resources.requests.cpu=500m \ + --set resources.requests.memory=2Gi \ --set resources.limits.cpu=1200m \ --set resources.limits.memory=2Gi \ --set livenessProbe.initialDelaySeconds=10 \ @@ -193,7 +195,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 4140013f44521110f9d294387b97a0fd8a8ac27c..8be599e67e9a8b005f6e7397d821783f55210b0d 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 2ed44f33aa3171fdb2c44cc08fc22faea9df38c8..2fe5af242e4a1e1bfe6ed91b03ed09fec9643757 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 50a6828bb0d7c3d4794873827c1186b54379aa31..25db460906c68c3da97cee027c9986b0cb7014b7 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 defd5f5e0ffc9432789223bdb036527bf8cb9ba2..c1df9b34f16ba7674d2372ec7c6998a047b2cacc 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 e2308409d2fda1d11093ea672c8f24087b6c8b98..4b5138520b10055faaed701afcccda3dfe617d01 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 1f43815ef8636c7a78cae10034266bbb980db940..a31be9716bc51001fcc47c2705794e308f0d522b 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 85905ef3b7587670aaad732b4a1d77155e0789ca..5fa27d45d4c4b7102f65dadb4df45e1839e54333 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: